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

i18n update

File:
1 edited

Legend:

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

    r20093 r20140  
    88"Project-Id-Version: josm\n"
    99"Report-Msgid-Bugs-To: \n"
    10 "POT-Creation-Date: 2010-02-21 09:35+0100\n"
     10"POT-Creation-Date: 2010-02-24 19:46+0100\n"
    1111"PO-Revision-Date: 2010-01-23 21:14+0000\n"
    1212"Last-Translator: Tor Christian Tovslid <tctovsli@gmail.com>\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:15+0000\n"
     18"X-Launchpad-Export-Date: 2010-02-24 18:30+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
     
    244244#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
    245245#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
    246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
     246#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191
    247247#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
    248248#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373
     
    388388#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
    389389#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
    390 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154
     390#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
    391391#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
    392392#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375
     
    690690#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
    691691#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
    692 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
     692#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989
    693693#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
    694694#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
     
    812812#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
    813813#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
    814 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368
     814#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
    815815msgid "Duplicate"
    816816msgstr "Fordoble"
     
    16491649
    16501650#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
    1651 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
    1652 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
     1651#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635
     1652#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676
    16531653#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
    16541654msgid "No, abort"
     
    23602360#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
    23612361#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
    2362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
     2362#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
    23632363#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
    23642364#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
     
    29242924
    29252925#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
    2926 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111
     2926#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114
    29272927msgid "Double conflict"
    29282928msgstr ""
     
    29572957#. should not happen
    29582958#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
    2959 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78
     2959#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
    29602960msgid "Cannot resolve undecided conflict."
    29612961msgstr "kan ikke løse uavgjort konflikt"
     
    31313131msgstr ""
    31323132
    3133 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
     3133#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53
    31343134#, java-format
    31353135msgid "Resolve conflicts in node list of way {0}"
    31363136msgstr ""
    31373137
    3138 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70
     3138#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71
    31393139#, java-format
    31403140msgid "Main dataset does not include node {0}"
     
    34113411msgstr ""
    34123412
    3413 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148
    3414 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216
     3413#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150
     3414#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
    34153415#, java-format
    34163416msgid "Missing merge target for way with id {0}"
    34173417msgstr ""
    34183418
    3419 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164
    3420 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228
     3419#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
     3420#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235
    34213421#, java-format
    34223422msgid "Missing merge target for node with id {0}"
    34233423msgstr ""
    34243424
    3425 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187
     3425#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190
    34263426#, java-format
    34273427msgid "Missing merge target for object with id {0}"
    34283428msgstr ""
    34293429
    3430 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243
     3430#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250
    34313431#, java-format
    34323432msgid "Missing merge target for relation with id {0}"
    34333433msgstr ""
    34343434
    3435 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248
     3435#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255
    34363436#, java-format
    34373437msgid "Missing merge target of type {0} with id {1}"
     
    34413441#. FIXME: this message does not make sense, source version can not be lower than
    34423442#. target version at this point
    3443 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:281
     3443#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292
    34443444#, java-format
    34453445msgid ""
     
    35843584msgstr ""
    35853585
    3586 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291
    3587 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313
     3586#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292
     3587#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314
    35883588#, java-format
    35893589msgid "Cannot add node {0} to incomplete way {1}."
     
    37013701#. darker blue
    37023702#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
    3703 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181
     3703#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
    37043704#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183
    37053705msgid "background"
     
    39413941#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
    39423942#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
    3943 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:172
     3943#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
    39443944msgid "Conflict"
    39453945msgstr "Konflikt"
     
    41914191#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936
    41924192#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
    4193 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
     4193#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
    41944194#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
    41954195#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209
     
    44254425msgstr "rolle {0} deltar ikke i sammenlikningspar {1}"
    44264426
    4427 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:103
    4428 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:207
     4427#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105
     4428#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209
    44294429#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178
    44304430msgid "Properties"
    44314431msgstr "Egenskaper"
    44324432
    4433 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:108
    4434 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:171
     4433#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110
     4434#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173
    44354435#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
    4436 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235
     4436#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239
    44374437#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
    44384438#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507
     
    44414441msgstr "Egenskaper"
    44424442
    4443 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:113
    4444 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:256
     4443#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115
     4444#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259
    44454445#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
    44464446#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
     
    44484448msgstr "Noder"
    44494449
    4450 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:118
    4451 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:251
    4452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
     4450#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120
     4451#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254
     4452#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275
    44534453#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
    44544454msgid "Members"
    44554455msgstr "Medlemmer"
    44564456
    4457 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172
     4457#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174
    44584458msgid "No pending tag conflicts to be resolved"
    44594459msgstr "Ingen gjenværende egenskapskonflikter å løse"
    44604460
    4461 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175
     4461#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
    44624462#, java-format
    44634463msgid "Tags({0} conflict)"
     
    44664466msgstr[1] ""
    44674467
    4468 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
     4468#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178
    44694469#, java-format
    44704470msgid "{0} pending tag conflict to be resolved"
     
    44734473msgstr[1] ""
    44744474
    4475 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184
     4475#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
    44764476msgid "Nodes(resolved)"
    44774477msgstr "Noder (løst)"
    44784478
    4479 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
     4479#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
    44804480msgid ""
    44814481"Merged node list frozen. No pending conflicts in the node list of this way"
     
    44844484"linjas nodeliste."
    44854485
    4486 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188
     4486#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
    44874487msgid "Nodes(with conflicts)"
    44884488msgstr "Noder (med konflikter)"
    44894489
    4490 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
     4490#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191
    44914491msgid "Pending conflicts in the node list of this way"
    44924492msgstr "Gjenværende konflikter i denne veiens nodeliste"
    44934493
    4494 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194
     4494#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
    44954495msgid "Members(resolved)"
    44964496msgstr "Medlemmer (løst)"
    44974497
    4498 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195
     4498#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
    44994499msgid ""
    45004500"Merged member list frozen. No pending conflicts in the member list of this "
     
    45044504"denne relasjonens medlemsliste."
    45054505
    4506 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
     4506#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
    45074507msgid "Members(with conflicts)"
    45084508msgstr "Medlemmer (med konflikter)"
    45094509
    4510 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
     4510#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
    45114511msgid "Pending conflicts in the member list of this relation"
    45124512msgstr "Gjenværende konflikter i denne relasjonens medlemsliste"
    45134513
    4514 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208
     4514#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210
    45154515msgid "No pending property conflicts"
    45164516msgstr "Ingen gjenværende egenskapskonflikter"
    45174517
    4518 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211
     4518#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213
    45194519msgid "Properties(with conflicts)"
    45204520msgstr "Egenskaper (med konflikter)"
    45214521
    4522 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212
     4522#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214
    45234523msgid "Pending property conflicts to be resolved"
    45244524msgstr "Gjenværende egenskapskonflikter å løse"
    45254525
    4526 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292
     4526#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295
    45274527msgid "Conflict Resolution"
    45284528msgstr "Konfliktløsning"
     
    45684568
    45694569#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280
    4570 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85
     4570#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
    45714571msgid "My version"
    45724572msgstr "Lokal versjon"
     
    45774577
    45784578#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
    4579 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91
    4580 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:139
     4579#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
     4580#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140
    45814581msgid "Merged version"
    45824582msgstr "Sammenslått versjon"
     
    45914591
    45924592#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
    4593 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97
     4593#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
    45944594msgid "Their version"
    45954595msgstr "Tjenerversjon"
     
    47784778msgstr "Node"
    47794779
    4780 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
     4780#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
    47814781msgid "Merged nodes not frozen yet. Cannot build resolution command."
    47824782msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
    47834783
    4784 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460
     4784#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463
    47854785#, java-format
    47864786msgid ""
     
    47914791"</html>"
    47924792
    4793 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
     4793#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467
    47944794msgid "Communication with server failed"
    47954795msgstr "Kommunikasjon med tjener feilet"
    47964796
    4797 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
    4798 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540
     4797#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509
     4798#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543
    47994799msgid "Yes, undelete them too"
    48004800msgstr "Ja, gjenopprett også dem"
    48014801
    4802 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507
    4803 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541
     4802#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510
     4803#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544
    48044804msgid "No, cancel operation"
    48054805msgstr "Nei, avbryt operasjonen"
    48064806
    4807 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511
     4807#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
    48084808#, java-format
    48094809msgid ""
     
    48164816msgstr[1] ""
    48174817
    4818 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521
     4818#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524
    48194819msgid "Undelete additional nodes?"
    48204820msgstr "Gjenopprette ytterligere noder?"
    48214821
    4822 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545
     4822#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548
    48234823#, java-format
    48244824msgid ""
     
    48314831msgstr[1] ""
    48324832
    4833 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555
     4833#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558
    48344834msgid "Undelete dependent primitives?"
    48354835msgstr "Gjenopprette avhengige objekter?"
    48364836
    4837 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
     4837#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87
    48384838msgid "Properties in my dataset, i.e. the local dataset"
    48394839msgstr "Egenskaper i det lokate datasettet"
    48404840
    4841 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
     4841#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93
    48424842msgid ""
    48434843"Properties in the merged element. They will replace properties in my "
     
    48474847"elementer når sammenslåingsvalgene tas i bruk."
    48484848
    4849 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
     4849#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99
    48504850msgid "Properties in their dataset, i.e. the server dataset"
    48514851msgstr "Egenskaper i tjenerens datasett"
    48524852
    4853 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114
     4853#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115
    48544854msgid "Coordinates:"
    48554855msgstr "Koordinater:"
    48564856
    4857 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188
     4857#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189
    48584858msgid "Deleted State:"
    48594859msgstr "Slettestatus:"
    48604860
    4861 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
     4861#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265
    48624862msgid "Visible State:"
    48634863msgstr "Synlighetsstatus:"
    48644864
    4865 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340
     4865#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341
    48664866msgid "Referenced by:"
    48674867msgstr ""
    48684868
    4869 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
    4870 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:388
    4871 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:397
    4872 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:406
    4873 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415
     4869#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377
     4870#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389
     4871#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398
     4872#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407
     4873#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416
    48744874#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
    48754875msgid "(none)"
    48764876msgstr "(ingen)"
    48774877
    4878 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390
     4878#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391
    48794879#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77
    48804880msgid "deleted"
    48814881msgstr "slettet"
    48824882
    4883 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392
     4883#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393
    48844884msgid "not deleted"
    48854885msgstr "ikke slettet"
    48864886
    4887 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399
     4887#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400
    48884888msgid "visible (on the server)"
    48894889msgstr "synlig (på tjeneren)"
    48904890
    4891 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401
     4891#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402
    48924892msgid "not visible (on the server)"
    48934893msgstr "ikke synlig (på tjeneren)"
    48944894
    4895 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408
     4895#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409
    48964896msgid "Keep a clone of the local version"
    48974897msgstr "Behold en klone av den lokale versjonen"
    48984898
    4899 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410
     4899#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
    49004900msgid "Physically delete from local dataset"
    49014901msgstr "Slett fra det lokale datasettet"
    49024902
    4903 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528
     4903#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529
    49044904msgid "Keep my coordiates"
    49054905msgstr "Behold lokale koordinater"
    49064906
    4907 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543
     4907#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544
    49084908msgid "Keep their coordiates"
    49094909msgstr "Behold tjenerens koordinater"
    49104910
    4911 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558
     4911#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559
    49124912msgid "Undecide conflict between different coordinates"
    49134913msgstr "Fjern avgjørelse fra koordinatkonflikt"
    49144914
    4915 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573
     4915#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574
    49164916msgid "Keep my deleted state"
    49174917msgstr "Behold lokal slettestatus"
    49184918
    4919 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588
     4919#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589
    49204920msgid "Keep their deleted state"
    49214921msgstr "Behold tjenerens slettestatus"
    49224922
    4923 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603
     4923#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604
    49244924msgid "Undecide conflict between deleted state"
    49254925msgstr "Fjern avgjørelse fra slettekonflikt"
    49264926
    4927 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
     4927#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619
    49284928msgid "Keep my visible state"
    49294929msgstr "Behold lokal synlighetsstatus"
    49304930
    4931 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
     4931#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
    49324932msgid "Yes, reset the id"
    49334933msgstr "Ja, nullstill ID"
    49344934
    4935 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638
     4935#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
    49364936#, java-format
    49374937msgid ""
     
    49414941msgstr ""
    49424942
    4943 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645
     4943#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
    49444944msgid "Reset id to 0"
    49454945msgstr "Nullstill ID"
    49464946
    4947 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659
     4947#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660
    49484948msgid "Keep their visible state"
    49494949msgstr "Behold tjenerens synlighetsstatus"
    49504950
    4951 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674
     4951#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
    49524952msgid "Yes, purge it"
    49534953msgstr "Ja, rydd ut objektet"
    49544954
    4955 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679
     4955#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680
    49564956#, java-format
    49574957msgid ""
     
    49624962"OK?</html>"
    49634963
    4964 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684
     4964#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685
    49654965msgid "Remove from dataset"
    49664966msgstr "Fjern fra datasett"
    49674967
    4968 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698
     4968#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699
    49694969msgid "Undecide conflict between visible state"
    49704970msgstr "Fjern avgjørelse fra visningskonflikt"
     
    50345034msgstr "Kan ikke bruke uavgjort sammenslåing for egenskap"
    50355035
    5036 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128
     5036#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129
    50375037msgid "My version (local dataset)"
    50385038msgstr "Lokalt datasett"
    50395039
    5040 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151
     5040#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152
    50415041msgid "Their version (server dataset)"
    50425042msgstr "Tjenerens datasett"
    50435043
    5044 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274
     5044#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275
    50455045msgid "Keep the selected key/value pairs from the local dataset"
    50465046msgstr "Behold valgte nøkkel–verdi-par fra det lokale datasettet"
    50475047
    5048 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304
     5048#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305
    50495049msgid "Keep the selected key/value pairs from the server dataset"
    50505050msgstr "Behold valgte nøkkel–verdi-par fra tjenerens datasettet"
    50515051
    5052 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397
     5052#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398
    50535053msgid "Undecide"
    50545054msgstr "Fjern avgjørelse"
    50555055
    5056 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399
     5056#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400
    50575057msgid "Mark the selected tags as undecided"
    50585058msgstr "Fjerner avgjørelse fra valgte egenskaper"
     
    50955095#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
    50965096#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
    5097 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
     5097#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124
    50985098msgid "Apply"
    50995099msgstr ""
     
    54005400msgstr ""
    54015401
    5402 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
     5402#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
    54035403#, java-format
    54045404msgid "Conflicts: {0} unresolved"
    54055405msgstr ""
    54065406
    5407 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
     5407#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325
    54085408msgid "Resolve"
    54095409msgstr "Løs"
    54105410
    5411 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328
     5411#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
    54125412msgid "Open a merge dialog of all selected items in the list above."
    54135413msgstr "Åpne en dialog for å sammenføye element i lista ovenfor."
    54145414
    5415 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348
     5415#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
    54165416#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
    54175417#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
     
    55325532
    55335533#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282
    5534 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
     5534#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
    55355535#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
    55365536#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
     
    56275627
    56285628#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
    5629 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365
     5629#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368
    56305630msgid "Create a copy of this relation and open it in another editor window"
    56315631msgstr ""
     
    56795679
    56805680#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299
    5681 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349
     5681#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353
    56825682#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
    56835683msgid "Selection"
     
    73637363#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332
    73647364#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
    7365 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
     7365#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095
    73667366msgid "Conflict in data"
    73677367msgid_plural "Conflicts in data"
     
    74107410msgstr ""
    74117411
    7412 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150
     7412#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154
    74137413msgid "Tags and Members"
    74147414msgstr ""
    74157415
    7416 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152
    7417 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
     7416#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156
     7417#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
    74187418msgid "Parent Relations"
    74197419msgstr ""
    74207420
    7421 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153
     7421#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
    74227422msgid "Child Relations"
    74237423msgstr ""
    74247424
    7425 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
     7425#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297
    74267426msgid "Apply Role:"
    74277427msgstr ""
    74287428
    7429 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295
     7429#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
    74307430msgid "Enter a role and apply it to the selected relation members"
    74317431msgstr ""
    74327432
    7433 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572
     7433#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575
    74347434msgid ""
    74357435"<html>There is at least one member in this relation referring<br>to the "
     
    74387438msgstr ""
    74397439
    7440 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
    7441 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580
     7440#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582
     7441#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
    74427442msgid "Remove them, clean up relation"
    74437443msgstr ""
    74447444
    7445 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
     7445#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582
    74467446msgid "Ignore them, leave relation as is"
    74477447msgstr ""
    74487448
    7449 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602
     7449#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605
    74507450#, java-format
    74517451msgid ""
     
    74557455msgstr ""
    74567456
    7457 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
     7457#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615
    74587458msgid "Multiple members referring to same primitive"
    74597459msgstr ""
    74607460
    7461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630
     7461#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
    74627462#, java-format
    74637463msgid ""
     
    74677467msgstr ""
    74687468
    7469 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
     7469#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674
    74707470msgid ""
    74717471"Add all primitives selected in the current dataset before the first member"
    74727472msgstr ""
    74737473
    7474 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697
     7474#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700
    74757475msgid ""
    74767476"Add all primitives selected in the current dataset after the last member"
    74777477msgstr ""
    74787478
    7479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724
     7479#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727
    74807480msgid ""
    74817481"Add all primitives selected in the current dataset before the first selected "
     
    74837483msgstr ""
    74847484
    7485 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758
     7485#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761
    74867486msgid ""
    74877487"Add all primitives selected in the current dataset after the last selected "
     
    74897489msgstr ""
    74907490
    7491 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790
     7491#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
    74927492msgid "Remove all members referring to one of the selected primitives"
    74937493msgstr ""
    74947494
    74957495#. putValue(NAME, tr("Remove Selected"));
    7496 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
     7496#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796
    74977497msgid "Relation Editor: Remove Selected"
    74987498msgstr ""
    74997499
    7500 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827
    7501 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
     7500#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830
     7501#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842
    75027502msgid ""
    75037503"Select relation members which refer to primitives in the current selection"
    75047504msgstr ""
    75057505
    7506 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
     7506#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
    75077507#, java-format
    75087508msgid ""
     
    75117511msgstr ""
    75127512
    7513 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861
     7513#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864
    75147514msgid "Select primitives for selected relation members"
    75157515msgstr ""
    75167516
    7517 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881
     7517#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
    75187518msgid "Sort the relation members"
    75197519msgstr ""
    75207520
    7521 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
     7521#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886
    75227522msgid "Sort"
    75237523msgstr "Sorter"
    75247524
    7525 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
     7525#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887
    75267526msgid "Relation Editor: Sort"
    75277527msgstr ""
    75287528
    7529 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
     7529#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
    75307530msgid "Reverse the order of the relation members"
    75317531msgstr ""
    75327532
    7533 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
     7533#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
    75347534msgid "Reverse"
    75357535msgstr ""
    75367536
    7537 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
     7537#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
    75387538msgid "Relation Editor: Reverse"
    75397539msgstr ""
    75407540
    7541 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927
     7541#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
    75427542msgid "Move the currently selected members up"
    75437543msgstr "Flytt valgte medlem opp"
    75447544
    75457545#. putValue(NAME, tr("Move Up"));
    7546 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
     7546#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933
    75477547msgid "Relation Editor: Move Up"
    75487548msgstr ""
    75497549
    7550 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946
     7550#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
    75517551msgid "Move the currently selected members down"
    75527552msgstr "Flytt valgt medlem ned"
    75537553
    75547554#. putValue(NAME, tr("Move Down"));
    7555 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
     7555#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952
    75567556msgid "Relation Editor: Move Down"
    75577557msgstr ""
    75587558
    7559 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965
     7559#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
    75607560msgid "Remove the currently selected members from this relation"
    75617561msgstr ""
    75627562
    75637563#. putValue(NAME, tr("Remove"));
    7564 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
     7564#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971
    75657565msgid "Relation Editor: Remove"
    75667566msgstr ""
    75677567
    7568 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984
     7568#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987
    75697569msgid "Delete the currently edited relation"
    75707570msgstr ""
    75717571
    7572 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
     7572#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
    75737573msgid "Yes, create a conflict and close"
    75747574msgstr ""
    75757575
    7576 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075
     7576#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078
    75777577msgid "Click to create a conflict and close this relation editor"
    75787578msgstr ""
    75797579
    7580 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079
     7580#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
    75817581msgid "No, continue editing"
    75827582msgstr ""
    75837583
    7584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081
     7584#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084
    75857585msgid "Click to return to the relation editor and to resume relation editing"
    75867586msgstr ""
    75877587
    7588 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088
     7588#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
    75897589msgid ""
    75907590"<html>This relation has been changed outside of the editor.<br>You cannot "
     
    75937593msgstr ""
    75947594
    7595 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105
     7595#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108
    75967596#, java-format
    75977597msgid ""
     
    76007600msgstr ""
    76017601
    7602 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119
     7602#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122
    76037603msgid "Apply the current updates"
    76047604msgstr ""
    76057605
    7606 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
     7606#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
    76077607msgid "Apply the updates and close the dialog"
    76087608msgstr ""
    76097609
    7610 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186
     7610#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
    76117611msgid "Cancel the updates and close the dialog"
    76127612msgstr ""
    76137613
    7614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203
     7614#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206
    76157615msgid "Add an empty tag"
    76167616msgstr ""
    76177617
    7618 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216
     7618#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
    76197619msgid "Download all incomplete members"
    76207620msgstr ""
    76217621
    7622 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
    7623 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253
     7622#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
     7623#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256
    76247624msgid "Download Members"
    76257625msgstr "Last ned medlemmer"
    76267626
    7627 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
     7627#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222
     7628#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
     7629msgid "Relation Editor: Download Members"
     7630msgstr ""
     7631
    76287632#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
    7629 msgid "Relation Editor: Download Members"
    7630 msgstr ""
    7631 
    7632 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251
    76337633msgid "Download selected incomplete members"
    76347634msgstr ""
    76357635
    7636 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
     7636#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293
    76377637msgid "Sets a role for the selected members"
    76387638msgstr ""
    76397639
    7640 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292
     7640#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
    76417641msgid "Apply Role"
    76427642msgstr ""
    76437643
    7644 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306
     7644#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
    76457645#, java-format
    76467646msgid "You are setting an empty role on {0} primitive."
     
    76497649msgstr[1] ""
    76507650
    7651 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
     7651#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
    76527652msgid "This is equal to deleting the roles of these primitives."
    76537653msgstr ""
    76547654
    7655 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311
     7655#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
    76567656msgid "Do you really want to apply the new role?"
    76577657msgstr ""
    76587658
    7659 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313
     7659#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316
    76607660msgid "Yes, apply it"
    76617661msgstr ""
    76627662
    7663 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
     7663#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317
    76647664msgid "No, do not apply"
    76657665msgstr ""
    76667666
    7667 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
     7667#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323
    76687668msgid "Confirm empty role"
    76697669msgstr ""
    76707670
    7671 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
     7671#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
    76727672msgid "Edit the relation the currently selected relation member refers to"
    76737673msgstr ""
     
    77127712msgstr ""
    77137713
    7714 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93
     7714#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
    77157715msgid "Load parent relations"
    77167716msgstr ""
    77177717
    7718 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
     7718#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
    77197719msgid "Loading parent relations"
    77207720msgstr ""
    77217721
    7722 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
     7722#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
    77237723msgid "Edit the currently selected relation"
    77247724msgstr ""
     
    1376513765msgstr ""
    1376613766
    13767 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:348
     13767#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353
    1376813768#, java-format
    1376913769msgid "Unable to find translation for the locale {0}. Reverting to {1}."
     
    1627916279
    1628016280#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:304
    16281 #, fuzzy
    1628216281msgid "Apply edited tags and close dialog"
    16283 msgstr "Ta i bruk løste konflikter og lukk vinduet"
     16282msgstr ""
    1628416283
    1628516284#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
     
    3048730486msgstr ""
    3048830487
    30489 #~ msgid "<multiple>"
    30490 #~ msgstr "<multiple>"
    30491 
    3049230488#~ msgid "Move"
    3049330489#~ msgstr "Flytt"
     
    3098430980#~ msgid "error requesting update"
    3098530981#~ msgstr "feil ved bestilling av oppdatering"
     30982
     30983#~ msgid "<multiple>"
     30984#~ msgstr "<multiple>"
    3098630985
    3098730986#~ msgid "Import TCX file as GPS track"
Note: See TracChangeset for help on using the changeset viewer.