Ignore:
Timestamp:
2009-06-27T15:59:16+02:00 (17 years ago)
Author:
stoecker
Message:

updated

File:
1 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/i18n/po/nb.po

    r16009 r16179  
    88"Project-Id-Version: josm\n"
    99"Report-Msgid-Bugs-To: \n"
    10 "POT-Creation-Date: 2009-06-19 21:52+0200\n"
    11 "PO-Revision-Date: 2009-06-14 18:00+0000\n"
     10"POT-Creation-Date: 2009-06-27 14:26+0200\n"
     11"PO-Revision-Date: 2009-06-19 22:13+0000\n"
    1212"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
    1313"Language-Team: Norwegian Bokmal <nb@li.org>\n"
    … …  
    1616"Content-Transfer-Encoding: 8bit\n"
    1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
    18 "X-Launchpad-Export-Date: 2009-06-19 19:35+0000\n"
     18"X-Launchpad-Export-Date: 2009-06-27 12:16+0000\n"
    1919"X-Generator: Launchpad (build Unknown)\n"
    2020
    … …  
    2727#: ../core/src/org/openstreetmap/josm/Main.java:198
    2828#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
    29 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154
    30 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302
     29#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
     30#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
    3131msgid "Help"
    3232msgstr "Hjelp"
    … …  
    7070#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
    7171#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
    72 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:341
    73 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
    74 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
    75 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356
     72#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
     73#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
     74#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
    7675#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
    7776#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
    … …  
    7978#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
    8079#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
    81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161
    82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151
     80#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152
    8381#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
    8482#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
    … …  
    9896#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
    9997#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
    100 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
    101 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
    102 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
     98#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
     99#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
     100#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
    103101#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
    104102msgid "Cancel"
    … …  
    203201msgid "File could not be found."
    204202msgstr "Filen finnes ikke."
     203
     204#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38
     205#, java-format
     206msgid ""
     207"WARNING: unexpected format of API base URL. Redirection to history page for "
     208"OSM primitive will probably fail. API base URL is: ''{0}''"
     209msgstr ""
     210
     211#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
     212#, fuzzy
     213msgid "Please select at least one already uploaded node, way, or relation."
     214msgstr "Velg minst en lukket linje å sammenføye med."
     215
     216#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
     217#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
     218#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
     219#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
     220msgid "Warning"
     221msgstr "Advarsel"
     222
     223#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69
     224#, java-format
     225msgid ""
     226"WARNING: launching browser windows for the first {0} of {1} selected "
     227"primitives only"
     228msgstr ""
    205229
    206230#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
    … …  
    246270#: ../plugins/grid/src/grid/GridLayer.java:193
    247271#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
    248 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
     272#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
    249273msgid "Latitude"
    250274msgstr "Breddegrad"
    … …  
    253277#: ../plugins/grid/src/grid/GridLayer.java:195
    254278#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
    255 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96
     279#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
    256280msgid "Longitude"
    257281msgstr "Lengdegrad"
    … …  
    288312#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
    289313#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
    290 #: ../plugins/terracer/src/terracer/TerracerAction.java:82
    291 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
    292 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
     314#: ../plugins/terracer/src/terracer/TerracerAction.java:72
     315#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
     316#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
    293317#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
    294318#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
    … …  
    321345msgstr "Velg minst 3 noder"
    322346
     347#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
     348#, java-format
     349msgid ""
     350"Current number of changes exceeds the max. number of changes, current is "
     351"{0}, max is {1}"
     352msgstr ""
     353
     354#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
     355#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116
     356msgid "API Capabilities Violation"
     357msgstr ""
     358
     359#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
     360msgid "Failed to initialize API. Please try again later."
     361msgstr ""
     362
     363#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
     364#, fuzzy
     365msgid "API initialization failed"
     366msgstr "Ikke startet"
     367
     368#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
     369#, java-format
     370msgid ""
     371"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
     372"{1}"
     373msgstr ""
     374
     375#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94
     376#, java-format
     377msgid ""
     378"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
     379"length {2}. Values length is {3}."
     380msgstr ""
     381
     382#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
     383#, fuzzy
     384msgid "Precondition Violation"
     385msgstr "Relasjonen har konflikter"
     386
     387#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
     388#, java-format
     389msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
     390msgstr ""
     391
    323392#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
    324393msgid "data"
    … …  
    334403
    335404#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
    336 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223
     405#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
    337406msgid "conflict"
    338407msgstr "konflikt"
    … …  
    413482#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
    414483#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
    415 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
    416 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
     484#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:109
     485#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:301
    417486msgid "Enter values for all conflicts."
    418487msgstr "Legg inn verdier for alle konflikter."
    … …  
    420489#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
    421490#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
    422 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
     491#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
    423492msgid "Solve Conflicts"
    424493msgstr "Løs konflikt"
    … …  
    639708
    640709#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
    641 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:556
     710#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
    642711#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
    643712#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
    644713#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
    645 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
    646 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:559
    647 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:563
     714#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
     715#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
     716#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
    648717#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
    649718#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
    … …  
    673742#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
    674743#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
    675 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
     744#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
    676745#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
    677746#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
    … …  
    714783msgstr ""
    715784
    716 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
    717 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:29
     785#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
     786#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
    718787msgid "History of Element"
    719788msgstr "Historikk på Elementet"
    720789
    721 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:27
    722 msgid "Display history information about OSM ways or nodes."
     790#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
     791#, fuzzy
     792msgid "Display history information about OSM ways, nodes, or relations."
    723793msgstr "Vis historikk på OSM linjer eller noder."
    724794
    725 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:77
    726 msgid ""
    727 "Please select at least one node, way or relation. Only already uploaded "
    728 "elements have a history."
    729 msgstr ""
    730 "Velg minst en node,linje eller relasjon. Bare opplastede element har "
    731 "historikk.."
     795#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
     796#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
     797#, fuzzy
     798msgid "Info about Element"
     799msgstr "Historikk på Elementet"
     800
     801#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
     802#, fuzzy
     803msgid "Display object information about OSM nodes, ways, or relations."
     804msgstr "Vis historikk på OSM linjer eller noder."
    732805
    733806#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
    … …  
    865938#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54
    866939#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
    867 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54
    868940#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
    869941#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27
    870942#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
    871 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
    872 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43
    873943#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174
    874944#, java-format
    … …  
    10551125
    10561126#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
    1057 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180
     1127#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
    10581128msgid "Conflicts"
    10591129msgstr "Konflikter"
    … …  
    12031273"linjen.)"
    12041274
    1205 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:305
     1275#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312
    12061276msgid ""
    12071277"A role based relation membership was copied to all new ways.\n"
    … …  
    12111281"Sjekk og korriger slik at dette er riktig."
    12121282
    1213 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:310
     1283#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
     1284#, fuzzy
     1285msgid ""
     1286"A relation membership was copied to all new ways.\n"
     1287"You should verify this and correct it when necessary."
     1288msgstr ""
     1289"Medlemskap i en Relasjon basert på en Rolle er kopiert til alle nye linjer\n"
     1290"Sjekk og korriger slik at dette er riktig."
     1291
     1292#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
    12141293#, java-format
    12151294msgid "Split way {0} into {1} parts"
    … …  
    13501429msgstr "Ingen data å oppdatere. Har du allerede åpnet eller lastet dette ned?"
    13511430
    1352 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:70
    1353 msgid "Undeleting Way..."
    1354 msgstr ""
    1355 
    1356 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:133
    1357 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:247
    1358 msgid "Yes, undelete them too"
    1359 msgstr ""
    1360 
    1361 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:134
    1362 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:248
    1363 msgid "No, cancel operation"
    1364 msgstr ""
    1365 
    1366 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:138
    1367 #, java-format
    1368 msgid ""
    1369 "<html>There are {0} additional nodes used by way {1}<br>which are deleted on "
    1370 "the server.<br><br>Do you want to undelete these nodes too?</html>"
    1371 msgstr ""
    1372 
    1373 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:143
    1374 msgid "Undelete additional nodes?"
    1375 msgstr ""
    1376 
    1377 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:170
    1378 #, java-format
    1379 msgid "Checking whether node {0} is gone ..."
    1380 msgstr ""
    1381 
    1382 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203
    1383 msgid "Undeleting relation..."
    1384 msgstr ""
    1385 
    1386 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:252
    1387 #, java-format
    1388 msgid ""
    1389 "<html>There are {0} additional primitives referred to by relation {1}"
    1390 "<br>which are deleted on the server.<br><br>Do you want to undelete them too?"
    1391 "</html>"
    1392 msgstr ""
    1393 
    1394 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:257
    1395 msgid "Undelete dependent primitives?"
    1396 msgstr ""
    1397 
    1398 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:284
    1399 #, java-format
    1400 msgid "Checking whether primitive {0} is gone ..."
    1401 msgstr ""
    1402 
    1403 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:339
    1404 msgid "Keep mine"
    1405 msgstr ""
    1406 
    1407 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:340
    1408 msgid "Delete mine"
    1409 msgstr ""
    1410 
    1411 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:344
    1412 #, java-format
    1413 msgid ""
    1414 "<html>The OSM primitive with id <strong>{0}</strong> has been deleted<br>on "
    1415 "the server by another mapper.<br><br>Click <strong>{1}</strong> to keep your "
    1416 "primitive and ignore the deleted state.<br>Your primitive will be assigend a "
    1417 "new id.<br>Click <strong>{2}</strong> to accept the state on the server and "
    1418 "to delete your primitive.<br>Click <strong>{3}</strong> to cancel.<br>"
    1419 msgstr ""
    1420 
    1421 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:356
    1422 msgid "Primitive deleted on the server"
    1423 msgstr ""
    1424 
    1425 #. should not happen
    1426 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:370
    1427 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:344
    1428 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:383
    1429 #, java-format
    1430 msgid "unexpected return value. Got {0}"
    1431 msgstr ""
    1432 
    1433 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:395
     1431#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:58
    14341432msgid "Failed to update the selected primitives."
    14351433msgstr ""
    14361434
    1437 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:396
     1435#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:59
    14381436msgid "Update failed"
    14391437msgstr ""
    14401438
    1441 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:408
     1439#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:71
    14421440#, java-format
    14431441msgid "Could not find primitive with id {0} in the current dataset"
    14441442msgstr ""
    14451443
    1446 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:409
     1444#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:72
    14471445msgid "Missing primitive"
    14481446msgstr ""
    14491447
    1450 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:441
    1451 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:445
     1448#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:103
     1449#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:107
    14521450msgid "Update Selection"
    14531451msgstr ""
    14541452
    1455 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:443
     1453#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:105
    14561454msgid "Updates the currently selected primitives from the server"
    14571455msgstr ""
    14581456
    1459 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:457
     1457#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119
    14601458msgid "There are no selected primitives to update."
    14611459msgstr ""
    14621460
    1463 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:458
     1461#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
    14641462msgid "Selection empty"
    1465 msgstr ""
    1466 
    1467 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:471
    1468 #, java-format
    1469 msgid ""
    1470 "<html>There are  <strong>{0}</strong> primitives <br>selected for individual "
    1471 "update. Please reduce the selection<br>to max. {1} primitives.</html>"
    1472 msgstr ""
    1473 
    1474 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:476
    1475 msgid "Selection too big"
    14761463msgstr ""
    14771464
    … …  
    14851472msgstr "Last opp alle endringer til OSM serveren."
    14861473
    1487 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
     1474#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
    14881475msgid "Objects to add:"
    14891476msgstr "Objekter som legges til:"
    14901477
    1491 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
     1478#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
    14921479msgid "Objects to modify:"
    14931480msgstr "Objekter som endres:"
    14941481
    1495 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
     1482#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
    14961483msgid "Objects to delete:"
    14971484msgstr "Objekter som slettes:"
    14981485
    1499 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
     1486#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
    15001487msgid "Provide a brief comment for the changes you are uploading:"
    15011488msgstr "Gi en kort kommentar for endringene du laster opp:"
    15021489
    1503 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
     1490#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
    15041491msgid "Upload these changes?"
    15051492msgstr "Laste opp disse endringene?"
    15061493
    1507 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
     1494#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
    15081495msgid "Upload Changes"
    15091496msgstr "Last opp endringer"
    15101497
    1511 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:152
     1498#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
    15121499msgid "Nothing to upload. Get some data first."
    15131500msgstr "Ingen endringer å laste opp. Finn frem data først."
    15141501
    1515 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
     1502#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
    15161503msgid "There are unresolved conflicts. You have to resolve these first."
    15171504msgstr "Data inneholder uløste konflikter som først må løses."
    15181505
    1519 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
     1506#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
    15201507msgid "No changes to upload."
    15211508msgstr "Ingen endringer å laste opp."
    15221509
    1523 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:203
     1510#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
    15241511msgid "Uploading"
    15251512msgstr ""
    15261513
    1527 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
     1514#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
    15281515msgid "Updating primitive"
    15291516msgstr ""
    15301517
    1531 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
     1518#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
    15321519#, java-format
    15331520msgid "Synchronize {0} {1} only"
    15341521msgstr ""
    15351522
    1536 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
    1537 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:355
     1523#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
     1524#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
    15381525msgid "Synchronize entire dataset"
    15391526msgstr ""
    15401527
    1541 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
     1528#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
    15421529#, java-format
    15431530msgid ""
    … …  
    15511538msgstr ""
    15521539
    1553 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
    1554 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:370
     1540#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
     1541#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
    15551542msgid "Conflict detected"
    15561543msgstr ""
    15571544
    1558 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
     1545#. should not happen
     1546#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
     1547#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
     1548#, java-format
     1549msgid "unexpected return value. Got {0}"
     1550msgstr ""
     1551
     1552#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
    15591553#, java-format
    15601554msgid ""
    … …  
    15651559msgstr ""
    15661560
    1567 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:399
     1561#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
    15681562#, java-format
    15691563msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
    15701564msgstr ""
    15711565
    1572 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
     1566#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
    15731567#, java-format
    15741568msgid ""
    … …  
    15781572msgstr ""
    15791573
    1580 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
     1574#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
    15811575msgid "Precondition violation"
    15821576msgstr ""
    15831577
    1584 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:452
     1578#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
    15851579#, java-format
    15861580msgid ""
    … …  
    15901584msgstr ""
    15911585
    1592 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:463
     1586#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
    15931587msgid "Primitive already deleted"
    15941588msgstr ""
    15951589
    1596 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:484
    1597 #, java-format
    1598 msgid "Error header \"{0}\" doesn't match expected pattern \"{1}\""
    1599 msgstr ""
    1600 
    1601 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:539
     1590#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
     1591#, java-format
     1592msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
     1593msgstr ""
     1594
     1595#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
    16021596msgid "Upload to OSM API failed"
    16031597msgstr ""
    16041598
    1605 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:552
     1599#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
    16061600#, java-format
    16071601msgid ""
    … …  
    17231717msgstr "OpenStreetMap data"
    17241718
    1725 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
     1719#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
    17261720msgid "Data Layer"
    17271721msgstr "Data Lag"
    17281722
    1729 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:55
     1723#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
    17301724#, java-format
    17311725msgid "Download {0} of {1} ({2} left)"
    17321726msgstr "Last ned {0} av {1} ({2} gjenstår)"
    17331727
     1728#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94
     1729msgid "The following errors occurred during mass download:"
     1730msgstr ""
     1731
    17341732#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:95
    1735 msgid "The following errors occurred during mass download:"
    1736 msgstr ""
    1737 
    1738 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:96
    17391733msgid "Errors during Download"
    17401734msgstr "Feil under nedlasting:"
    17411735
    1742 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:135
     1736#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:134
    17431737#, java-format
    17441738msgid ""
    17451739"<html>There are {0} primitives in your local dataset which<br>might be "
    1746 "deleted on the server. If you later try to delete or<br>update them on the "
    1747 "server the server is likely to report a<br>conflict.<br><br>Click <strong>{1}"
    1748 "</strong> to check these primitives individually.<br>Click <strong>{2}</"
    1749 "strong> to ignore.<br></html>"
     1740"deleted on the server. If you later try to delete or<br>update them the "
     1741"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
     1742"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
     1743"</strong> to ignore.<br></html>"
    17501744msgstr ""
    17511745
    … …  
    18931887#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
    18941888#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
    1895 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
     1889#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
    18961890#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
    18971891#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
    … …  
    22492243msgstr ""
    22502244
    2251 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78
    2252 #, java-format
    2253 msgid "Resolve {0} conflicts in {1} objects"
    2254 msgstr "{0} konflikter må løses i {1} objecter"
    2255 
    22562245#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
    22572246#, java-format
    … …  
    22612250#. should not happen
    22622251#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
    2263 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73
     2252#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
    22642253msgid "cannot resolve undecided conflict"
    22652254msgstr ""
    … …  
    23302319#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
    23312320#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
    2332 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112
     2321#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
    23332322#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
    23342323#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
    … …  
    23412330msgstr[1] "Node"
    23422331
    2343 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:157
     2332#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
    23442333msgid "Purging 1 primitive"
    23452334msgstr ""
    23462335
    23472336#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188
     2337#, java-format
     2338msgid "removing reference from way {0}"
     2339msgstr ""
     2340
     2341#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194
    23482342#, java-format
    23492343msgid ""
    … …  
    23522346msgstr ""
    23532347
     2348#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
     2349#, fuzzy, java-format
     2350msgid "removing reference from relation {0}"
     2351msgstr "Fjernede Element fra Relasjoner"
     2352
    23542353#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
    23552354#, java-format
    … …  
    23742373msgstr ""
    23752374
    2376 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
     2375#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:69
    23772376#, java-format
    23782377msgid "Undelete {0} primitives"
    23792378msgstr ""
    23802379
    2381 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:44
     2380#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
    23822381#, java-format
    23832382msgid "Resolve version conflicts for {0} {1}"
    … …  
    23932392msgstr "Gjennomfør?"
    23942393
    2395 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141
     2394#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:142
    23962395msgid ""
    23972396"When reversing this way, the following changes to properties of the way and "
    … …  
    24822481msgstr "Kan ikke lese oppsett fra server."
    24832482
    2484 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
    2485 msgid "different"
    2486 msgstr "forskjellig"
    2487 
    2488 #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
    2489 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
    2490 msgid "deleted"
    2491 msgstr "slettet"
    2492 
    2493 #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
    2494 msgid "true"
    2495 msgstr "sann"
    2496 
    2497 #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
    2498 msgid "false"
    2499 msgstr "usann"
    2500 
    2501 #: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
    2502 msgid "position"
    2503 msgstr "posisjon"
    2504 
    25052483#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
    25062484msgid "Decimal Degrees"
    … …  
    25272505msgstr "Ø"
    25282506
    2529 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:287
     2507#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288
    25302508#, java-format
    25312509msgid "parameter {0} > 0 required. Got {1}."
    25322510msgstr ""
    25332511
    2534 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108
    2535 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:84
    2536 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115
     2512#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
     2513#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
     2514#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
    25372515msgid "incomplete"
    25382516msgstr "uferdig"
    25392517
    2540 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
     2518#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48
    25412519#, java-format
    25422520msgid "Error: {0}"
    25432521msgstr "Feil: {0}"
    25442522
    2545 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
     2523#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48
    25462524#, java-format
    25472525msgid "Warning: {0}"
    … …  
    25672545
    25682546#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
    2569 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:88
     2547#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:99
    25702548#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69
    25712549#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
    … …  
    25982576msgstr ""
    25992577
    2600 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:107
     2578#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:118
    26012579#, java-format
    26022580msgid "{0} member"
    … …  
    26052583msgstr[1] "{0} Medlemmer"
    26062584
    2607 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:121
     2585#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:136
    26082586msgid "highway"
    26092587msgstr "riksvei"
    26102588
    2611 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
     2589#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:137
    26122590#: build/trans_presets.java:2994
    26132591msgid "railway"
    26142592msgstr "jernbane"
    26152593
    2616 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123
     2594#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138
    26172595msgid "waterway"
    26182596msgstr "vannvei"
    26192597
    2620 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:124
     2598#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:139
    26212599msgid "landuse"
    26222600msgstr "bruk av grunn"
    26232601
    2624 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
     2602#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:143
    26252603#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323
    26262604#, java-format
    … …  
    26732651#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
    26742652#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
     2653#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
     2654#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
     2655#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
    26752656#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
    26762657#, java-format
    … …  
    28142795msgstr "tekst"
    28152796
     2797#. should not happen
     2798#.
     2799#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
     2800#, java-format
     2801msgid ""
     2802"My primitive with id {0} and version {1} is visible although their primitive "
     2803"with lower version {2} is not visible. Can't deal with this inconsistency. "
     2804"Keeping my primitive. "
     2805msgstr ""
     2806
    28162807#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
    28172808#, java-format
    … …  
    28322823
    28332824#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
    2834 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231
     2825#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
    28352826#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
    28362827msgid "background"
    … …  
    29152906msgstr "Kan ikke lagre bokmerke."
    29162907
    2917 #. setting up the properties table
    2918 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
    2919 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
    2920 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
    2921 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
    2922 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
    2923 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
    2924 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
    2925 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
    2926 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
    2927 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
    2928 msgid "Key"
    2929 msgstr "Nøkkel"
    2930 
    2931 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
    2932 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
    2933 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
    2934 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
    2935 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
    2936 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
    2937 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
    2938 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
    2939 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
    2940 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
    2941 msgid "Value"
    2942 msgstr "Verdi"
    2943 
    2944 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:224
    2945 #, java-format
    2946 msgid "{0} object has conflicts:"
    2947 msgid_plural "{0} objects have conflicts:"
    2948 msgstr[0] "{0} object har konflikter:"
    2949 msgstr[1] "{0} object har konflikter:"
    2950 
    2951 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:227
    2952 msgid "my version:"
    2953 msgstr "min versjon:"
    2954 
    2955 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:233
    2956 msgid "their version:"
    2957 msgstr "annen versjon:"
    2958 
    2959 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:239
    2960 msgid "resolved version:"
    2961 msgstr "rett versjon"
    2962 
    29632908#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
    29642909msgid "Message of the day not available"
    … …  
    31393084msgstr "Innstilligen  {0} er fjernet fordi den ikke lenger brukes."
    31403085
    3141 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
     3086#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
    31423087msgid "File"
    31433088msgstr "Fil"
    31443089
    3145 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
     3090#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152
    31463091msgid "View"
    31473092msgstr "Vis"
    31483093
    3149 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
     3094#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153
    31503095msgid "Tools"
    31513096msgstr "Verktøy"
    31523097
    3153 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152
     3098#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154
    31543099#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
    31553100msgid "Presets"
    31563101msgstr "Objektmaler"
    31573102
    3158 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
     3103#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
    31593104#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
    31603105#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
    … …  
    31673112
    31683113#. TODO move code to an "action" like the others?
    3169 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:219
     3114#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
    31703115msgid "Wireframe View"
    31713116msgstr "Vis akselinjer"
    31723117
    3173 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
     3118#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223
    31743119msgid "Toggle Wireframe view"
    31753120msgstr "Slå av/på akselinjer"
    31763121
    3177 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
     3122#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
    31783123msgid "Full Screen"
    31793124msgstr "Fullskjerm"
    31803125
    3181 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
     3126#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251
    31823127msgid "Toggle Full Screen view"
    31833128msgstr "Slå av/på fullskjerm"
    31843129
    3185 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
     3130#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292
    31863131msgid "Audio"
    31873132msgstr "Audio"
    … …  
    33183263msgstr ""
    33193264
    3320 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63
    3321 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124
     3265#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64
     3266#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125
    33223267msgid "Properties"
    33233268msgstr ""
    33243269
    3325 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68
    3326 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93
     3270#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
     3271#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
    33273272#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
    33283273#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
    … …  
    33303275msgstr "Egenskaper"
    33313276
    3332 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73
    3333 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163
     3277#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
     3278#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
    33343279msgid "Nodes"
    33353280msgstr ""
    33363281
    3337 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78
    3338 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158
     3282#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
     3283#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
    33393284#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
    33403285msgid "Members"
    33413286msgstr "Medlemmer"
    33423287
    3343 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
     3288#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
    33443289msgid "No pending tag conflicts to be resolved"
    33453290msgstr ""
    33463291
    3347 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97
     3292#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98
    33483293#, java-format
    33493294msgid "Tags({0} conflicts)"
    33503295msgstr ""
    33513296
    3352 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98
     3297#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99
    33533298#, java-format
    33543299msgid "{0} pending tag conflicts to be resolved"
    33553300msgstr ""
    33563301
    3357 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104
     3302#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105
    33583303msgid "Nodes(resolved)"
    33593304msgstr ""
    33603305
    3361 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105
     3306#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
    33623307msgid ""
    33633308"Merged node list frozen. No pending conflicts in the node list of this way"
    33643309msgstr ""
    33653310
    3366 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:108
     3311#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109
    33673312msgid "Nodes(with conflicts)"
    33683313msgstr ""
    33693314
    3370 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109
     3315#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110
    33713316msgid "Pending conflicts in the node list of this way"
    33723317msgstr ""
    33733318
    3374 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113
     3319#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114
    33753320msgid "Members(resolved)"
    33763321msgstr ""
    33773322
    3378 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114
     3323#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115
    33793324msgid ""
    33803325"Merged member list frozen. No pending conflicts in the member list of this "
    … …  
    33823327msgstr ""
    33833328
    3384 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:117
     3329#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118
    33853330msgid "Members(with conflicts)"
    33863331msgstr ""
    33873332
    3388 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118
     3333#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119
    33893334msgid "Pending conflicts in the member list of this relation"
    33903335msgstr ""
    33913336
    3392 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125
     3337#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126
    33933338msgid "No pending property conflicts"
    33943339msgstr ""
    33953340
    3396 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128
     3341#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129
    33973342msgid "Properties(with conflicts)"
    33983343msgstr ""
    33993344
    3400 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129
     3345#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130
    34013346msgid "Pending property conflicts to be resolved"
    34023347msgstr ""
    34033348
    3404 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
     3349#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207
    34053350msgid "Conflict Resolution"
    34063351msgstr ""
    … …  
    34373382
    34383383#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
    3439 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:75
     3384#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81
    34403385msgid "My version"
    34413386msgstr ""
    … …  
    34463391
    34473392#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
    3448 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81
     3393#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87
    34493394#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
    34503395msgid "Merged version"
    … …  
    34583403
    34593404#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
    3460 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87
     3405#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93
    34613406msgid "Their version"
    34623407msgstr ""
    … …  
    36413586msgstr ""
    36423587
    3643 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76
     3588#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
     3589#, java-format
     3590msgid ""
     3591"<html>An error occurred while communicating with the server<br>Details: {0}</"
     3592"html>"
     3593msgstr ""
     3594
     3595#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
     3596#, fuzzy
     3597msgid "Communication with server failed"
     3598msgstr "Tilkobling mislykkes"
     3599
     3600#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
     3601#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505
     3602msgid "Yes, undelete them too"
     3603msgstr ""
     3604
     3605#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477
     3606#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
     3607msgid "No, cancel operation"
     3608msgstr ""
     3609
     3610#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481
     3611#, java-format
     3612msgid ""
     3613"<html>There are {0} additional nodes used by way {1}<br>which are deleted on "
     3614"the server.<br><br>Do you want to undelete these nodes too?</html>"
     3615msgstr ""
     3616
     3617#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486
     3618msgid "Undelete additional nodes?"
     3619msgstr ""
     3620
     3621#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510
     3622#, java-format
     3623msgid ""
     3624"<html>There are {0} additional primitives referred to by relation {1}"
     3625"<br>which are deleted on the server.<br><br>Do you want to undelete them too?"
     3626"</html>"
     3627msgstr ""
     3628
     3629#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515
     3630msgid "Undelete dependent primitives?"
     3631msgstr ""
     3632
     3633#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
    36443634msgid "Properties in my dataset, i.e. the local dataset"
    36453635msgstr ""
    36463636
    3647 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
     3637#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
    36483638msgid ""
    36493639"Properties in the merged element. They will replace properties in my "
    … …  
    36513641msgstr ""
    36523642
    3653 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
     3643#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
    36543644msgid "Properties in their dataset, i.e. the server dataset"
    36553645msgstr ""
    36563646
    3657 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:101
     3647#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110
    36583648msgid "Coordinates:"
    36593649msgstr ""
    36603650
    3661 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:174
     3651#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186
    36623652msgid "Deleted State:"
    36633653msgstr ""
    36643654
    3665 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:248
    3666 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:260
     3655#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263
     3656msgid "Visible State:"
     3657msgstr ""
     3658
     3659#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343
     3660#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355
     3661#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364
     3662#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373
    36673663#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
    36683664msgid "(none)"
    36693665msgstr "(ingen)"
    36703666
    3671 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
     3667#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357
     3668msgid "deleted"
     3669msgstr "slettet"
     3670
     3671#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359
    36723672msgid "not deleted"
    36733673msgstr ""
    36743674
    3675 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:334
     3675#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
     3676msgid "visible (on the server)"
     3677msgstr ""
     3678
     3679#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
     3680msgid "not visible (on the server)"
     3681msgstr ""
     3682
     3683#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
     3684#, fuzzy
     3685msgid "Keep a clone of the local version"
     3686msgstr "Tast inn et navn for stedet."
     3687
     3688#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
     3689msgid "Physically delete from local dataset"
     3690msgstr ""
     3691
     3692#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
    36763693msgid "Keep my coordiates"
    36773694msgstr ""
    36783695
    3679 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:349
     3696#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491
    36803697msgid "Keep their coordiates"
    36813698msgstr ""
    36823699
    3683 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364
     3700#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506
    36843701msgid "Undecide conflict between different coordinates"
    36853702msgstr ""
    36863703
    3687 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:379
     3704#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521
    36883705msgid "Keep my deleted state"
    36893706msgstr ""
    36903707
    3691 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:394
     3708#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536
    36923709msgid "Keep their deleted state"
    36933710msgstr ""
    36943711
    3695 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:409
     3712#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551
    36963713msgid "Undecide conflict between deleted state"
     3714msgstr ""
     3715
     3716#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
     3717msgid "Keep my visible state"
     3718msgstr ""
     3719
     3720#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
     3721msgid "Yes, reset the id"
     3722msgstr ""
     3723
     3724#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
     3725#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
     3726#, fuzzy
     3727msgid "No, abort"
     3728msgstr "Ingen dato"
     3729
     3730#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
     3731#, java-format
     3732msgid ""
     3733"<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} to "
     3734"0.<br>On the next upload the server will assign<br>it a new id.<br>Do yo "
     3735"agree?</html>"
     3736msgstr ""
     3737
     3738#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594
     3739msgid "Reset id to 0"
     3740msgstr ""
     3741
     3742#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
     3743msgid "Keep their visible state"
     3744msgstr ""
     3745
     3746#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
     3747msgid "Yes, purge it"
     3748msgstr ""
     3749
     3750#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
     3751#, java-format
     3752msgid ""
     3753"<html>JOSM will have to remove your local primitive with id {0}<br>from the "
     3754"dataset.<br>Do you agree?</html>"
     3755msgstr ""
     3756
     3757#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
     3758#, fuzzy
     3759msgid "Remove from dataset"
     3760msgstr "fjern fra utvalg"
     3761
     3762#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
     3763msgid "Undecide conflict between visible state"
    36973764msgstr ""
    36983765
    … …  
    37373804msgstr ""
    37383805
     3806#. setting up the properties table
     3807#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
     3808#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
     3809#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
     3810#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
     3811#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
     3812#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
     3813#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
     3814#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
     3815#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
     3816msgid "Key"
     3817msgstr "Nøkkel"
     3818
     3819#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
     3820#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
     3821#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
     3822#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
     3823#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
     3824#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
     3825#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
     3826#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
     3827#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
     3828msgid "Value"
     3829msgstr "Verdi"
     3830
    37393831#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108
    37403832msgid "cannot apply undecided tag merge item"
    … …  
    37933885
    37943886#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
    3795 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
     3887#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
    37963888#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
    37973889#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
    … …  
    38153907msgstr "Kommandoliste: {0}"
    38163908
    3817 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55
     3909#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
    38183910#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
    38193911#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
    … …  
    38223914msgstr "Sett valgte kartobjekt til det som er valgt i lista ovenfor."
    38233915
    3824 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
     3916#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
    38253917msgid "Resolve"
    38263918msgstr "Løs"
    38273919
    3828 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65
     3920#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
    38293921msgid "Open a merge dialog of all selected items in the list above."
    38303922msgstr "Åpne en dialog for å sammenføye element i lista ovenfor."
    38313923
    3832 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
    3833 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
     3924#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
     3925#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
    38343926msgid "Conflict"
    38353927msgstr "Konflikt"
    38363928
    3837 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
     3929#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
    38383930msgid "Merging conflicts."
    38393931msgstr "Konflikter ved sammenføyning."
    38403932
    3841 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
    3842 msgid "WARNING: unexpected value for preference conflict.resolution, got "
    3843 msgstr ""
    3844 
    3845 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159
    3846 msgid "Resolve Conflicts"
    3847 msgstr "Løs Konflikter"
    3848 
    3849 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161
    3850 msgid "Solve Conflict"
    3851 msgstr "Løs Konflikt"
    3852 
    3853 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178
     3933#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
    38543934#, java-format
    38553935msgid "Conflicts: {0}"
    38563936msgstr "Konflikter: {0}"
    38573937
    3858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129
     3938#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
    38593939msgid "Resolve conflicts"
    38603940msgstr ""
    38613941
    3862 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150
     3942#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151
    38633943msgid "Cancel conflict resolution and close the dialog"
    38643944msgstr ""
    38653945
    3866 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164
     3946#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165
    38673947msgid "Apply resolved conflicts and close the dialog"
    38683948msgstr ""
    38693949
    3870 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165
     3950#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166
    38713951msgid "Apply Resolution"
    38723952msgstr ""
    38733953
    3874 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173
     3954#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174
    38753955msgid "Apply partial resolutions"
    38763956msgstr ""
    38773957
    3878 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174
     3958#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175
    38793959msgid "Continue resolving"
    38803960msgstr ""
    38813961
    3882 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176
     3962#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177
    38833963#, java-format
    38843964msgid ""
    … …  
    38883968"resolving conflicts.</html>"
    38893969msgstr ""
    3890 
    3891 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:182
    3892 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256
    3893 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
    3894 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
    3895 msgid "Warning"
    3896 msgstr "Advarsel"
    38973970
    38983971#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
    … …  
    43174390#. item "Amenities/Toilets" combo "Fee"
    43184391#. item "Health/Pharmacy" combo "Dispensing"
    4319 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:418
     4392#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
    43204393#: build/trans_presets.java:312 build/trans_presets.java:313
    43214394#: build/trans_presets.java:314 build/trans_presets.java:315
    … …  
    43404413msgstr "ja"
    43414414
    4342 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:418
     4415#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
    43434416#: build/trans_presets.java:312 build/trans_presets.java:313
    43444417#: build/trans_presets.java:314 build/trans_presets.java:315
    … …  
    43654438msgstr "nei"
    43664439
    4367 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:423
     4440#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
    43684441#, java-format
    43694442msgid "Members: {0}"
    43704443msgstr "Medlemmer: {0}"
    43714444
    4372 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:431
     4445#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
    43734446#, java-format
    43744447msgid "Relation Editor: {0}"
    43754448msgstr "Relasjons-editor: {0}"
    43764449
    4377 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:545
     4450#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
    43784451msgid "There were conflicts during import."
    43794452msgstr "Det var konflikter ved import."
    43804453
    4381 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:555
     4454#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
    43824455msgid "Error parsing server response."
    43834456msgstr "Feil i oversendelse av server respons."
    43844457
    4385 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:558
     4458#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
    43864459msgid "Cannot connect to server."
    43874460msgstr "Kan ikke koble til serveren."
    43884461
    4389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562
     4462#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
    43904463msgid "Error when communicating with server."
    43914464msgstr ""
    … …  
    45674640msgstr "zoom"
    45684641
    4569 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110
     4642#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113
    45704643msgid "Slippy map"
    45714644msgstr "Flytbart kart"
    … …  
    45924665msgstr "Flis-nummer"
    45934666
    4594 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
     4667#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
    45954668#, java-format
    45964669msgid "Images for {0}"
    45974670msgstr "Bilder for {0}"
    45984671
    4599 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:103
     4672#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
    46004673msgid "Read GPX..."
    46014674msgstr "Les GPX..."
    46024675
    4603 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:112
     4676#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
    46044677#, java-format
    46054678msgid "No time for point {0} x {1}"
    46064679msgstr "Ingen tid gitt for punkt {0} x {1}"
    46074680
    4608 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:117
     4681#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
    46094682#, java-format
    46104683msgid "Cannot read time \"{0}\" from point {1} x {2}"
    46114684msgstr "Kan ikke læse tid \"{0}\" for punkt {1} x {2}"
    46124685
    4613 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
     4686#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
    46144687msgid "No images with readable timestamps found."
    46154688msgstr "Ingen bilder med lesbare tidsstempler funnet"
    46164689
    4617 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:136
     4690#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
    46184691#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
    46194692#, java-format
    … …  
    46214694msgstr "Leser {0}..."
    46224695
    4623 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:203
     4696#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
    46244697#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
    46254698msgid "Geotagged Images"
    46264699msgstr "Geotaggede bilder"
    46274700
    4628 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:255
    4629 #, java-format
    4630 msgid "Image with path {0} does not exist or is not readable."
    4631 msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart."
    4632 
    4633 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363
     4701#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
    46344702#, java-format
    46354703msgid "GPS start: {0}"
    46364704msgstr "GPS start: {0}"
    46374705
    4638 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:364
     4706#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
    46394707#, java-format
    46404708msgid "GPS end: {0}"
    46414709msgstr "GPS-slutt: {0}"
    46424710
    4643 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:366
     4711#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
    46444712#, java-format
    46454713msgid "current delta: {0}s"
    46464714msgstr "nåværende forskjell: {0}s"
    46474715
    4648 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:367
     4716#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
    46494717msgid "timezone difference: "
    46504718msgstr "tidssone-forskjell: "
    46514719
    4652 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:391
     4720#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
    46534721#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
    46544722msgid "image"
    … …  
    46574725msgstr[1] "bilder"
    46584726
    4659 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:391
     4727#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
    46604728#, java-format
    46614729msgid "{0} within the track."
    46624730msgstr "{0} innenfor sporet."
    46634731
    4664 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
     4732#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
    46654733msgid "Sync clock"
    46664734msgstr "Synkronisér klokke"
    46674735
    4668 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443
     4736#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
    46694737#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
    46704738#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
    … …  
    46724740msgstr "JPEG-bilder (*.jpg)"
    46734741
    4674 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:489
     4742#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
    46754743#, java-format
    46764744msgid "The date in file \"{0}\" could not be parsed."
    46774745msgstr "Datoen i filen \"{0}\" kunne ikke tolkes."
    46784746
    4679 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:493
     4747#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
    46804748#, java-format
    46814749msgid "There is no EXIF time within the file \"{0}\"."
    46824750msgstr "Det er ikke EXIF-tidspunkt i fila \"{0}\"."
    46834751
    4684 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:497
     4752#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
    46854753msgid "Image"
    46864754msgstr "Bilde"
    46874755
    4688 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:499
     4756#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
    46894757msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
    46904758msgstr "Gi den viste dato (mm/dd/åååå TT:MM:SS)"
    46914759
    4692 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:502
     4760#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
    46934761msgid "GPS unit timezone (difference to photo)"
    46944762msgstr "GPS-enhetens tidssone (forskjell fra foto)"
    46954763
    4696 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:510
     4764#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
    46974765msgid "Synchronize Time with GPS Unit"
    46984766msgstr "Synkronisér tidspunkt med GPS-enhet"
    46994767
    4700 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:526
    4701 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:528
     4768#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
     4769#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
    47024770msgid "Time entered could not be parsed."
    47034771msgstr "Den indtastede tid kunne ikke tolkes"
    … …  
    48494917
    48504918#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
    4851 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
     4919#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
    48524920#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
    48534921#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
    … …  
    49194987msgstr "versjon {0}"
    49204988
    4921 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
     4989#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
    49224990msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
    49234991msgstr ""
    49244992
    4925 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280
     4993#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
    49264994#, java-format
    49274995msgid "There were {0} conflicts during import."
    49284996msgstr ""
    49294997
    4930 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:388
     4998#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
    49314999#, java-format
    49325000msgid "{0} consists of:"
    49335001msgstr "{0} består av:"
    49345002
    4935 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:392
     5003#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
    49365004#, java-format
    49375005msgid " ({0} deleted.)"
    49385006msgstr " ({0} slettet.)"
    49395007
    4940 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
     5008#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
    49415009msgid "unset"
    49425010msgstr "ikke satt"
    49435011
    4944 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
     5012#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
    49455013#, java-format
    49465014msgid "API version: {0}"
    49475015msgstr "API versjon: {0}"
    49485016
    4949 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
     5017#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
    49505018#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
    49515019msgid "Convert to GPX layer"
    … …  
    61646232
    61656233#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
    6166 #: ../plugins/terracer/src/terracer/TerracerAction.java:422
    6167 #: ../plugins/terracer/src/terracer/TerracerAction.java:440
    6168 #: ../plugins/terracer/src/terracer/TerracerAction.java:504
     6234#: ../plugins/terracer/src/terracer/TerracerAction.java:412
     6235#: ../plugins/terracer/src/terracer/TerracerAction.java:430
     6236#: ../plugins/terracer/src/terracer/TerracerAction.java:494
    61696237msgid "All"
    61706238msgstr "Alle"
    … …  
    69066974
    69076975#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
    6908 #: ../plugins/terracer/src/terracer/TerracerAction.java:108
     6976#: ../plugins/terracer/src/terracer/TerracerAction.java:98
    69096977#, java-format
    69106978msgid "Change {0} object"
    … …  
    69146982
    69156983#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
    6916 #: ../plugins/terracer/src/terracer/TerracerAction.java:110
     6984#: ../plugins/terracer/src/terracer/TerracerAction.java:100
    69176985msgid "Nothing selected!"
    69186986msgstr "Intet er valgt!"
    … …  
    69487016
    69497017#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102
     7018#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319
     7019#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345
    69507020#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33
    69517021#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49
    … …  
    69637033msgstr "Klargjør data..."
    69647034
    6965 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21
     7035#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
    69667036msgid "GPX Files"
    69677037msgstr "GPX filer"
    69687038
    6969 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48
     7039#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49
    69707040#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
     7041#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
    69717042#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
    69727043#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
    … …  
    69747045msgid "Markers from {0}"
    69757046msgstr "Markører fra {0}"
     7047
     7048#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
     7049#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
     7050#, java-format
     7051msgid "File \"{0}\" does not exist"
     7052msgstr ""
     7053
     7054#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
     7055#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43
     7056#, java-format
     7057msgid "Parsing file \"{0}\" failed"
     7058msgstr ""
    69767059
    69777060#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
    … …  
    69797062msgstr "Lesefeil: Strukturen i GPX fila er ukjent"
    69807063
     7064#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
     7065#, java-format
     7066msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
     7067msgstr ""
     7068
     7069#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
     7070#, java-format
     7071msgid "Server replied with response code 404 for id {0}. Skipping."
     7072msgstr ""
     7073
     7074#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
     7075msgid ""
     7076"Server replied with response code 404, retrying with an individual request "
     7077"for each primitive"
     7078msgstr ""
     7079
    69817080#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
    69827081msgid "NMEA-0183 Files"
    … …  
    69847083
    69857084#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
     7085#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
    69867086msgid "Coordinates imported: "
    69877087msgstr "Importerte koordinater: "
    … …  
    70537153msgstr "Lukker basen med rettinger..."
    70547154
    7055 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314
     7155#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
    70567156msgid "No changeset present for diff upload"
    70577157msgstr "Ingen base med rettinger tilstede for opplasting"
    70587158
    7059 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321
     7159#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320
    70607160msgid "Preparing..."
    70617161msgstr "Forbereder..."
    70627162
    7063 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
     7163#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
    70647164msgid "Uploading..."
    70657165msgstr "Laster opp..."
    … …  
    71547254msgstr "OSM server filer"
    71557255
    7156 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
     7256#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166
    71577257msgid "Unknown version"
    71587258msgstr "Ukjent versjon"
    71597259
    7160 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
     7260#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169
    71617261msgid "Version number missing from OSM data"
    71627262msgstr "Versjon nummer mangler i OSM data"
    71637263
    7164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
     7264#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
    71657265#, java-format
    71667266msgid "Unknown version: {0}"
    71677267msgstr "Ukjent versjon: {0}"
    71687268
    7169 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
     7269#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207
    71707270msgid "Found <nd> element in non-way."
    71717271msgstr "Fant <nd> element i ikke_linje."
    71727272
    7173 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
     7273#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210
    71747274msgid "<nd> has zero ref"
    71757275msgstr "<nd> har zero ref"
    71767276
    7177 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:214
     7277#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:222
    71787278msgid "Found <member> element in non-relation."
    71797279msgstr "Fandt <member>-element i en ikke-relation."
    71807280
    7181 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:219
     7281#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227
    71827282#, java-format
    71837283msgid "Missing attribute \"ref\" on member in relation {0}"
    71847284msgstr ""
    71857285
    7186 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
     7286#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
    71877287#, java-format
    71887288msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
    71897289msgstr ""
    71907290
    7191 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
     7291#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
    71927292#, java-format
    71937293msgid "Missing attribute \"type\" on member {0} in relation {1}"
    71947294msgstr ""
    71957295
    7196 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
     7296#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:237
    71977297#, java-format
    71987298msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
    71997299msgstr ""
    72007300
    7201 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
     7301#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
    72027302msgid "Incomplete <member> specification with ref=0"
    72037303msgstr "Ufullstendig <member>-spesifikasjon med ref=0"
    72047304
    7205 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
     7305#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
    72067306msgid "Illegal object with id=0"
    72077307msgstr "Ulovlig objekt med id=0"
    72087308
    7209 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
     7309#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:315
    72107310#, java-format
    72117311msgid ""
    … …  
    72137313msgstr ""
    72147314
    7215 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314
     7315#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
    72167316#, java-format
    72177317msgid "Missing attribute \"version\" on OSM primitive with id {0}"
    72187318msgstr ""
    72197319
    7220 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:329
     7320#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336
    72217321#, java-format
    72227322msgid "Missing required attribute \"{0}\"."
    72237323msgstr "Mangler obligatorisk attributt \"{0}\"."
    72247324
    7225 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356
     7325#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
    72267326#, java-format
    72277327msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
    72287328msgstr "Ignorerer en linje fordi den har en node som ikke eksisterer: {0}\n"
    72297329
    7230 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:485
     7330#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:495
    72317331msgid "Prepare OSM data..."
    72327332msgstr "Klargjør OSM data..."
    72337333
    7234 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
     7334#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507
    72357335msgid "Ill-formed node id"
    72367336msgstr "Feil id for node"
    … …  
    72617361"din."
    72627362
    7263 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:103
     7363#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96
    72647364#, java-format
    72657365msgid ""
    … …  
    72687368msgstr ""
    72697369
    7270 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:134
     7370#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129
    72717371#, java-format
    72727372msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
    … …  
    75177617msgstr "Feil oppsto ved lesing av info om programtillegg: {0}"
    75187618
    7519 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:300
     7619#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299
    75207620msgid "This is after the end of the recording"
    75217621msgstr "Dette er etter avsluttingen av opptaket"
    75227622
    7523 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
     7623#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339
    75247624msgid "Error playing sound"
    75257625msgstr "Feil med avspilling av lyd"
    … …  
    85208620msgstr ""
    85218621
     8622#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33
     8623msgid "TangoGPS Files (*.log)"
     8624msgstr ""
     8625
     8626#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
     8627#, fuzzy
     8628msgid "Format errors: "
     8629msgstr "Feil Fil Format"
     8630
     8631#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
     8632#, fuzzy
     8633msgid "TangoGPS import success"
     8634msgstr "NMEA data er lest inn"
     8635
     8636#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
     8637#, fuzzy
     8638msgid "TangoGPS import faliure!"
     8639msgstr "Feil ved import av NMEA data!"
     8640
    85228641#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
    85238642#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21
    … …  
    92509369msgstr "Vis tema i  OpenStreetBugs"
    92519370
     9371#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97
     9372msgid ""
     9373"<html>The openstreetbus plugin is using the old server at appspot.com.<br>A "
     9374"new server is available at schokokeks.org.<br>Do you want to switch to the "
     9375"new server? (Strongly recommended)</html>"
     9376msgstr ""
     9377
     9378#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100
     9379msgid "Switch to new openstreetbugs server?"
     9380msgstr ""
     9381
    92529382#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
    92539383msgid ""
    … …  
    93539483msgstr "Ukjent filtype {0}"
    93549484
    9355 #: ../plugins/osmarender/src/OsmarenderPlugin.java:41
     9485#: ../plugins/osmarender/src/OsmarenderPlugin.java:39
    93569486msgid "Osmarender"
    93579487msgstr "Osmarender"
    93589488
    9359 #: ../plugins/osmarender/src/OsmarenderPlugin.java:96
     9489#: ../plugins/osmarender/src/OsmarenderPlugin.java:94
    93609490msgid ""
    93619491"Firefox not found. Please set firefox executable in the Map Settings page of "
    … …  
    93649494"Fant ikke Firefox. Oppgi Firefox-programmet i siden for Kartinnstillinger."
    93659495
    9366 #: ../plugins/osmarender/src/OsmarenderPlugin.java:127
     9496#: ../plugins/osmarender/src/OsmarenderPlugin.java:125
    93679497msgid "osmarender options"
    93689498msgstr "osmarender-indstillinger"
    93699499
    9370 #: ../plugins/osmarender/src/OsmarenderPlugin.java:128
     9500#: ../plugins/osmarender/src/OsmarenderPlugin.java:126
    93719501msgid "Firefox executable"
    93729502msgstr "Firefox-programfil"
    … …  
    95139643msgstr "Gi verdier for vekting"
    95149644
    9515 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
     9645#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69
    95169646msgid "Slippy Map"
    95179647msgstr "Slippy Map"
    95189648
    9519 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
     9649#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75
    95209650msgid "Load Tile"
    95219651msgstr "Last Kartbilde"
    95229652
    9523 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
     9653#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86
    95249654msgid "Show Tile Status"
    95259655msgstr "Status på kartbilde"
    95269656
    9527 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
     9657#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97
    95289658msgid "Request Update"
    95299659msgstr "Be op Oppdatering"
    95309660
    9531 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
     9661#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108
    95329662msgid "Load All Tiles"
    95339663msgstr "Hent alle kartbilder"
    95349664
    9535 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
     9665#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118
    95369666msgid "Increase zoom"
    95379667msgstr "Zoom inn"
    95389668
    9539 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
     9669#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127
    95409670msgid "Decrease zoom"
    95419671msgstr "Zoom ut"
    95429672
    9543 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
     9673#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
     9674msgid "Flush Tile Cache"
     9675msgstr ""
     9676
     9677#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442
    95449678msgid "image not loaded"
    95459679msgstr "Bilde er ikke lest inn"
     9680
     9681#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
     9682#, fuzzy
     9683msgid "image loading..."
     9684msgstr "Laster opp..."
    95469685
    95479686#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
    … …  
    95829721msgstr "Demp bakgrunn: "
    95839722
    9584 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
     9723#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123
    95859724msgid "error loading metadata"
    95869725msgstr "feil ved lesing av informasjon om data"
    95879726
    9588 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
     9727#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138
    95899728#, java-format
    95909729msgid "requested: {0}"
    95919730msgstr "bestilt: {0}"
    95929731
    9593 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
     9732#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142
    95949733msgid "error requesting update"
    95959734msgstr "feil ved bestilling av oppdatering"
    … …  
    97609899msgstr "Reverser Terasseinndeling"
    97619900
    9762 #: ../plugins/terracer/src/terracer/TerracerAction.java:78
    9763 #: ../plugins/terracer/src/terracer/TerracerAction.java:82
     9901#: ../plugins/terracer/src/terracer/TerracerAction.java:68
     9902#: ../plugins/terracer/src/terracer/TerracerAction.java:72
    97649903msgid "Terrace a building"
    97659904msgstr "Terasseinndeling av hus (og rekkehus)"
    97669905
    9767 #: ../plugins/terracer/src/terracer/TerracerAction.java:80
     9906#: ../plugins/terracer/src/terracer/TerracerAction.java:70
    97689907msgid "Creates individual buildings from a long building."
    97699908msgstr "Del opp lang bygning i separate hus."
    97709909
    9771 #: ../plugins/terracer/src/terracer/TerracerAction.java:140
     9910#: ../plugins/terracer/src/terracer/TerracerAction.java:130
    97729911msgid "Select a single, closed way of at least four nodes."
    97739912msgstr "Velg en enkelt lukket linje med minst fire Noder."
    97749913
    9775 #: ../plugins/terracer/src/terracer/TerracerAction.java:209
     9914#: ../plugins/terracer/src/terracer/TerracerAction.java:199
    97769915msgid "Terrace"
    97779916msgstr "Terasse"
    97789917
    9779 #: ../plugins/terracer/src/terracer/TerracerAction.java:423
    9780 #: ../plugins/terracer/src/terracer/TerracerAction.java:447
     9918#: ../plugins/terracer/src/terracer/TerracerAction.java:413
     9919#: ../plugins/terracer/src/terracer/TerracerAction.java:437
    97819920msgid "Even"
    97829921msgstr "Heltall"
    97839922
    9784 #: ../plugins/terracer/src/terracer/TerracerAction.java:424
     9923#: ../plugins/terracer/src/terracer/TerracerAction.java:414
    97859924msgid "Odd"
    97869925msgstr "Oddetall"
    97879926
    9788 #: ../plugins/terracer/src/terracer/TerracerAction.java:482
     9927#: ../plugins/terracer/src/terracer/TerracerAction.java:472
    97899928msgid "Highest number"
    97909929msgstr "Høyseste nummer"
    97919930
    9792 #: ../plugins/terracer/src/terracer/TerracerAction.java:483
     9931#: ../plugins/terracer/src/terracer/TerracerAction.java:473
    97939932msgid "Lowest number"
    97949933msgstr "Laveste nummer"
    97959934
    9796 #: ../plugins/terracer/src/terracer/TerracerAction.java:484
     9935#: ../plugins/terracer/src/terracer/TerracerAction.java:474
    97979936msgid "Interpolation"
    97989937msgstr "Interpolasjon"
    97999938
    98009939#. item "Buildings/Addresses" text "House name"
    9801 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
     9940#: ../plugins/terracer/src/terracer/TerracerAction.java:475
    98029941#: build/trans_presets.java:2173
    98039942msgid "Street name"
    98049943msgstr "Gatenavn"
    98059944
    9806 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
     9945#: ../plugins/terracer/src/terracer/TerracerAction.java:475
    98079946msgid "Optional"
    98089947msgstr "Tillegg"
    … …  
    98459984msgstr "Beklager. Anonyme brukere får ikke lov til dette."
    98469985
    9847 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
     9986#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
    98489987msgid "Join overlapping Areas"
    98499988msgstr "Slå sammen områder med overlapp"
    98509989
    9851 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
     9990#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
    98529991msgid "Joins areas that overlap each other"
    98539992msgstr "Slår sammen områder med overlapp"
    98549993
    9855 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125
     9994#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
    98569995msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
    98579996msgstr "DETTE ER PÅ FORØKSTADIET. Lagre arbeidet og bekreft før opplasting."
    98589997
    9859 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
     9998#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
    98609999msgid "Continue anyway"
    986110000msgstr "Fortsett uansett"
    986210001
    9863 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:148
     10002#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:133
    986410003msgid "Only up to two areas can be joined at the moment."
    986510004msgstr "Bare to områder kan bli slått sammen foreløpig."
    986610005
    9867 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:153
     10006#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:138
    986810007#, java-format
    986910008msgid "\"{0}\" is not closed and therefore can't be joined."
    987010009msgstr "\"{0}\" er ikke lukket, og kan derfor ikke være med i sammenføyning."
    987110010
    9872 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:170
     10011#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:155
    987310012#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
    987410013msgid ""
    … …  
    988110020"Er du sikker på å fortsette?"
    988210021
    9883 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:173
     10022#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:158
    988410023#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67
    988510024msgid "Please abort if you are not sure"
    988610025msgstr "Angre hvis du er usikker"
    988710026
    9888 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:187
     10027#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:172
    988910028msgid "Please select at least one closed way the should be joined."
    989010029msgstr "Velg minst en lukket linje å sammenføye med."
    989110030
    9892 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
     10031#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:180
    989310032msgid "No intersection found. Nothing was changed."
    989410033msgstr ""
    989510034
    9896 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
     10035#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:202
    989710036msgid "Added node on all intersections"
    989810037msgstr "Noder er lagt til i alle skjæringspunkt"
    989910038
    9900 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
     10039#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
    990110040msgid "Delete Ways that are not part of an inner multipolygon"
    990210041msgstr "Slette indre linjer som ikke er del av multipolygon (relasjoner)"
    990310042
    9904 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
     10043#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
    990510044msgid "Fix relations"
    990610045msgstr "Reparer relasjoner"
    990710046
    9908 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
     10047#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
    990910048msgid "Joined self-overlapping area"
    991010049msgstr "Slo sammen områder som overlappet seg selv"
    991110050
    9912 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
     10051#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237
    991310052msgid "Joined overlapping areas"
    991410053msgstr "Slo sammen overlappende områder"
    991510054
    9916 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
     10055#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
    991710056msgid ""
    991810057"Some of the ways were part of relations that have been modified. Please "
    … …  
    992210061"feil er lagt inn."
    992310062
    9924 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
     10063#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
    992510064msgid "Fix tag conflicts"
    992610065msgstr "Reparer konflikter i egenskaper."
    992710066
    9928 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
     10067#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:464
    992910068msgid "Removed Element from Relations"
    993010069msgstr "Fjernede Element fra Relasjoner"
    993110070
    9932 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
     10071#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:573
    993310072msgid "Join Areas: Remove Short Ways"
    993410073msgstr "Slå sammen areal: Fjern Korte linjer"
    993510074
    9936 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
     10075#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
    993710076msgid "Closed Way"
    993810077msgstr "Lukket linje"
    993910078
    9940 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
     10079#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:856
    994110080msgid "Remove tags from inner ways"
    994210081msgstr "Fjern egenskaper på linjer som er del av Relasjon (inner)"
    994310082
    9944 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
     10083#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:885
    994510084msgid "Join Areas Function"
    994610085msgstr "Funksjon Slå sammen Areal"
    994710086
    9948 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
     10087#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
    994910088msgid "Jump To Position"
    995010089msgstr "Gå til Posisjon"
    995110090
    9952 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
     10091#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
    995310092msgid "Opens a dialog that allows to jump to a specific location"
    995410093msgstr "Åpner dialog som lar deg gå til bestemt posisjon"
    995510094
    9956 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:65
     10095#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
    995710096msgid "Enter Lat/Lon to jump to position."
    995810097msgstr "Gi inn Lat/Lon for posisjon du vil gå til"
    995910098
    9960 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:67
     10099#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
    996110100msgid "You can also paste an URL from www.openstreetmap.org"
    996210101msgstr "Du kan også lime inn URL fra www.openstreetmap.org"
    996310102
    9964 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:99
     10103#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
    996510104msgid "Zoom (in metres)"
    996610105msgstr "Zoom (i meter)"
    996710106
    9968 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
     10107#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
    996910108msgid "URL"
    997010109msgstr "URL"
    997110110
    9972 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
     10111#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
    997310112msgid "Jump there"
    997410113msgstr "Gå dit"
    997510114
    9976 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
     10115#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
    997710116msgid "Jump to Position"
    997810117msgstr "Gå til posisjon"
    997910118
    9980 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
     10119#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
    998110120msgid "Could not parse Latitude, Longitude or Zoom. Please check."
    998210121msgstr "Kunne ikke tolke Lat / Lon eller zoom. Sjekk input."
    998310122
    9984 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
     10123#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
    998510124msgid "Unable to parse Lon/Lat"
    998610125msgstr "Kunne ikke tolke Lat / Lon"
    … …  
    1104411183msgstr ""
    1104511184
     11185#. Plugin dataimport
     11186#: build/trans_plugins.java:13
     11187msgid "Allows to import various file formats into JOSM directly."
     11188msgstr ""
     11189
    1104611190#. Plugin DirectUpload
    11047 #: build/trans_plugins.java:13
     11191#: build/trans_plugins.java:15
    1104811192msgid ""
    1104911193"This plugin directly upload GPS Traces from current active layer in JOSM to "
    … …  
    1105411198
    1105511199#. Plugin Duplicate-Way
    11056 #: build/trans_plugins.java:15
     11200#: build/trans_plugins.java:17
    1105711201msgid "Duplicate Ways with an offset"
    1105811202msgstr "Dupliser linjer med parallell avstand"
    1105911203
    1106011204#. Plugin editgpx
    11061 #: build/trans_plugins.java:17
     11205#: build/trans_plugins.java:19
    1106211206msgid ""
    1106311207"Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
    … …  
    1106611210
    1106711211#. Plugin globalsat
    11068 #: build/trans_plugins.java:19
     11212#: build/trans_plugins.java:21
    1106911213msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
    1107011214msgstr "Last ned GPS punkt fra Globalsat dg100 data logger direkte til JOSM"
    1107111215
    1107211216#. Plugin grid
    11073 #: build/trans_plugins.java:21
     11217#: build/trans_plugins.java:23
    1107411218msgid "Provide a background layer that displays a map grid"
    1107511219msgstr "Bakgrunnslag som viser rutenettet i kartet"
    1107611220
    1107711221#. Plugin ImageWayPoint
    11078 #: build/trans_plugins.java:23
     11222#: build/trans_plugins.java:25
    1107911223msgid ""
    1108011224"Another plugin to match images to the waypoints in a GPX file. A match is "
    … …  
    1108711231
    1108811232#. Plugin lakewalker
    11089 #: build/trans_plugins.java:25
     11233#: build/trans_plugins.java:27
    1109011234msgid "Helps vectorizing WMS images."
    1109111235msgstr "For vektorisering av  WMS bilder."
    1109211236
    1109311237#. Plugin livegps
    11094 #: build/trans_plugins.java:27
     11238#: build/trans_plugins.java:29
    1109511239msgid ""
    1109611240"Support live GPS input (moving dot) through a connection to gpsd server."
    … …  
    1109811242
    1109911243#. Plugin measurement
    11100 #: build/trans_plugins.java:29
     11244#: build/trans_plugins.java:31
    1110111245msgid ""
    1110211246"Provide a measurement dialog and a layer to measure length and angle of "
    … …  
    1110911253
    1111011254#. Plugin nearclick
    11111 #: build/trans_plugins.java:31
     11255#: build/trans_plugins.java:33
    1111211256msgid ""
    1111311257"Simulates a click when you do a small and short drag. This is usefull for "
    … …  
    1112011264
    1112111265#. Plugin openlayers
    11122 #: build/trans_plugins.java:33
     11266#: build/trans_plugins.java:35
    1112311267msgid "Displays an OpenLayers background image"
    1112411268msgstr "Viser bakgrunnsbildet i et åpent lag"
    1112511269
    1112611270#. Plugin openstreetbugs
    11127 #: build/trans_plugins.java:35
     11271#: build/trans_plugins.java:37
    1112811272msgid "Imports issues from OpenStreetBugs"
    1112911273msgstr "Importerer tema fra OpenStreetBugs"
    1113011274
    1113111275#. Plugin openvisible
    11132 #: build/trans_plugins.java:37
     11276#: build/trans_plugins.java:39
    1113311277msgid ""
    1113411278"Allows opening gpx/osm files that intersect the currently visible screen area"
    … …  
    1113611280
    1113711281#. Plugin osmarender
    11138 #: build/trans_plugins.java:39
     11282#: build/trans_plugins.java:41
    1113911283msgid ""
    1114011284"Launches FireFox to display the current visible screen as a nice SVG image."
    … …  
    1114211286
    1114311287#. Plugin PicLayer
    11144 #: build/trans_plugins.java:41
     11288#: build/trans_plugins.java:43
    1114511289msgid ""
    1114611290"This plugin allows to display any picture as a background in the editor and "
    … …  
    1115111295
    1115211296#. Plugin plastic_laf
    11153 #: build/trans_plugins.java:43
     11297#: build/trans_plugins.java:45
    1115411298msgid "The great JGoodies Plastic Look and Feel."
    1115511299msgstr "JGoodies Plastic Look and Feel."
    1115611300
    1115711301#. Plugin remotecontrol
    11158 #: build/trans_plugins.java:45
     11302#: build/trans_plugins.java:47
    1115911303msgid "Let other applications send commands to JOSM."
    1116011304msgstr "La andre program sende kommandoer til JOSM."
    1116111305
    1116211306#. Plugin routing
    11163 #: build/trans_plugins.java:47
     11307#: build/trans_plugins.java:49
    1116411308msgid "Provides routing capabilities."
    1116511309msgstr "Gir deg Ruteplanlegger på OSM data."
    1116611310
    1116711311#. Plugin slippymap
    11168 #: build/trans_plugins.java:49
     11312#: build/trans_plugins.java:51
    1116911313msgid ""
    1117011314"Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
    … …  
    1117511319
    1117611320#. Plugin surveyor
    11177 #: build/trans_plugins.java:51
     11321#: build/trans_plugins.java:53
    1117811322msgid "Allow adding markers/nodes on current gps positions."
    1117911323msgstr "Legger inn markører eller Noder på gps posisjon."
    1118011324
    1118111325#. Plugin tageditor
    11182 #: build/trans_plugins.java:53
     11326#: build/trans_plugins.java:55
    1118311327msgid "Provides a dialog for editing tags in a tabular grid."
    1118411328msgstr "Dialog for å redigere egenskaper i en tabell."
    1118511329
    1118611330#. Plugin tagging-preset-tester
    11187 #: build/trans_plugins.java:55
     11331#: build/trans_plugins.java:57
    1118811332msgid ""
    1118911333"Adds a tagging preset tester to the help menu, which helps you developing of "
    … …  
    1119611340
    1119711341#. Plugin tcx-support
    11198 #: build/trans_plugins.java:57
     11342#: build/trans_plugins.java:59
    1119911343msgid "Directly load TCX files from JOSM."
    1120011344msgstr "Last inn TCX filer direkte fra JOSM."
    1120111345
    1120211346#. Plugin terracer
    11203 #: build/trans_plugins.java:59
     11347#: build/trans_plugins.java:61
    1120411348msgid "Make terraced houses out of single blocks."
    1120511349msgstr "Lager rekkehus / terassehus fra en enkel husblokk."
    1120611350
    1120711351#. Plugin usertools
    11208 #: build/trans_plugins.java:61
     11352#: build/trans_plugins.java:63
    1120911353msgid ""
    1121011354"Tools to work with authors/users. Selects map data that belongs to selected "
    … …  
    1121511359
    1121611360#. Plugin utilsplugin
    11217 #: build/trans_plugins.java:63
     11361#: build/trans_plugins.java:65
    1121811362msgid ""
    1121911363"Several utilities that make your life easier: e.g. simplify way, join areas, "
    … …  
    1122411368
    1122511369#. Plugin validator
    11226 #: build/trans_plugins.java:65
     11370#: build/trans_plugins.java:67
    1122711371msgid ""
    1122811372"An OSM data validator. It checks for problems in data, and provides fixes "
    … …  
    1123311377
    1123411378#. Plugin waydownloader
    11235 #: build/trans_plugins.java:67
     11379#: build/trans_plugins.java:69
    1123611380msgid "Easy downloading along a long set of interconnected ways"
    1123711381msgstr ""
    1123811382
    1123911383#. Plugin wmsplugin
    11240 #: build/trans_plugins.java:69
     11384#: build/trans_plugins.java:71
    1124111385msgid ""
    1124211386"Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
    … …  
    2239822542msgstr ""
    2239922543
     22544#~ msgid ""
     22545#~ "Please select at least one node, way or relation. Only already uploaded "
     22546#~ "elements have a history."
     22547#~ msgstr ""
     22548#~ "Velg minst en node,linje eller relasjon. Bare opplastede element har "
     22549#~ "historikk.."
     22550
     22551#~ msgid "Image with path {0} does not exist or is not readable."
     22552#~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart."
     22553
     22554#~ msgid "Uploading data"
     22555#~ msgstr "Laster opp data"
     22556
     22557#~ msgid "Email"
     22558#~ msgstr "E-post"
     22559
     22560#~ msgid "Resolve Conflicts"
     22561#~ msgstr "Løs Konflikter"
     22562
     22563#~ msgid "{0} object has conflicts:"
     22564#~ msgid_plural "{0} objects have conflicts:"
     22565#~ msgstr[0] "{0} object har konflikter:"
     22566#~ msgstr[1] "{0} object har konflikter:"
     22567
     22568#~ msgid "my version:"
     22569#~ msgstr "min versjon:"
     22570
     22571#~ msgid "their version:"
     22572#~ msgstr "annen versjon:"
     22573
     22574#~ msgid "resolved version:"
     22575#~ msgstr "rett versjon"
     22576
     22577#~ msgid "Login name (email) to the OSM account."
     22578#~ msgstr "Innloggings navnet (e-postadresse) til OSM kontoen."
     22579
     22580#~ msgid "OSM username (email)"
     22581#~ msgstr "OSM brukernavn (e-postadressen)"
     22582
     22583#~ msgid "Unknown host"
     22584#~ msgstr "Ukjent vert"
     22585
     22586#~ msgid "position"
     22587#~ msgstr "posisjon"
     22588
     22589#~ msgid "different"
     22590#~ msgstr "forskjellig"
     22591
     22592#~ msgid "true"
     22593#~ msgstr "sann"
     22594
     22595#~ msgid "false"
     22596#~ msgstr "usann"
     22597
     22598#~ msgid "Resolve {0} conflicts in {1} objects"
     22599#~ msgstr "{0} konflikter må løses i {1} objecter"
     22600
    2240022601#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
    2240122602#~ msgstr "Du kan bruke mus eller Ctrl+piltaster/./ for å zoome og panorere."
    22402 
    22403 #~ msgid "Uploading data"
    22404 #~ msgstr "Laster opp data"
    22405 
    22406 #~ msgid "Email"
    22407 #~ msgstr "E-post"
    22408 
    22409 #~ msgid "Login name (email) to the OSM account."
    22410 #~ msgstr "Innloggings navnet (e-postadresse) til OSM kontoen."
    22411 
    22412 #~ msgid "OSM username (email)"
    22413 #~ msgstr "OSM brukernavn (e-postadressen)"
    22414 
    22415 #~ msgid "Unknown host"
    22416 #~ msgstr "Ukjent vert"
    2241722603
    2241822604#~ msgid "Add either site-josm.xml or Wiki Pages."
    … …  
    2255222738#~ msgstr "Ingen skjæringspunkt funnet. Ingen endringer utført."
    2255322739
     22740#~ msgid "Solve Conflict"
     22741#~ msgstr "Løs Konflikt"
     22742
    2255422743#~ msgid ""
    2255522744#~ "This action will require {0} individual download requests. Do you wish to "
    … …  
    2258622775#~ "(fjerne uinteressante punkt) før opplasting til OSM."
    2258722776
    22588 #~ msgid "Not initialized"
    22589 #~ msgstr "Ikke startet"
    22590 
    2259122777#~ msgid "Cannot read numeric value from response"
    2259222778#~ msgstr "Finner ikke tallverdi i svaret"
Note: See TracChangeset for help on using the changeset viewer.