Index: applications/editors/josm/i18n/po/nb.po =================================================================== --- applications/editors/josm/i18n/po/nb.po (revision 19496) +++ applications/editors/josm/i18n/po/nb.po (revision 19552) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-13 18:28+0100\n" -"PO-Revision-Date: 2010-01-01 15:34+0000\n" +"POT-Creation-Date: 2010-01-18 14:23-0500\n" +"PO-Revision-Date: 2010-01-18 11:12-0500\n" "Last-Translator: Tor Christian Tovslid \n" "Language-Team: Norwegian Bokmal \n" @@ -20,5 +20,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:206 +#: ../core/src/org/openstreetmap/josm/Main.java:200 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -31,17 +31,17 @@ msgstr "Hjelp" -#: ../core/src/org/openstreetmap/josm/Main.java:384 +#: ../core/src/org/openstreetmap/josm/Main.java:378 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Overser feilutformet fil-URL: «{0}»" -#: ../core/src/org/openstreetmap/josm/Main.java:385 -#: ../core/src/org/openstreetmap/josm/Main.java:418 -#: ../core/src/org/openstreetmap/josm/Main.java:486 +#: ../core/src/org/openstreetmap/josm/Main.java:379 +#: ../core/src/org/openstreetmap/josm/Main.java:412 +#: ../core/src/org/openstreetmap/josm/Main.java:480 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 @@ -60,15 +60,15 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:638 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 @@ -79,10 +79,10 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:193 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:199 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:222 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:160 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:240 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:454 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:497 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 @@ -92,9 +92,9 @@ msgstr "Advarsel" -#: ../core/src/org/openstreetmap/josm/Main.java:417 +#: ../core/src/org/openstreetmap/josm/Main.java:411 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:485 +#: ../core/src/org/openstreetmap/josm/Main.java:479 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -115,8 +115,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:185 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:721 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:723 -#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:732 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:734 +#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62 msgid "Java OpenStreetMap Editor" msgstr "Java OpenStreetMap kartredigering" @@ -124,5 +124,5 @@ #. Add the version number #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64 -#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:69 +#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70 #, java-format msgid "Version {0}" @@ -199,5 +199,5 @@ #, java-format msgid "" -"You''re about to launch {0} browser windows.
This may both clutter your " +"You are about to launch {0} browser windows.
This may both clutter your " "screen with browser windows
and take some time to finish." msgstr "" @@ -221,5 +221,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -229,5 +229,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:158 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -237,7 +237,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 @@ -251,13 +251,12 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:670 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 -#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:689 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330 @@ -289,5 +288,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:428 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438 msgid "Merge" msgstr "Flett" @@ -296,6 +295,6 @@ #, java-format msgid "" -"There are no layers the source layer
''{0}''
could be merged " -"to." +"There are no layers the source layer
''{0}''
could be merged to." +"" msgstr "" @@ -380,9 +379,9 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:713 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107 @@ -400,5 +399,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 -msgid "Close the dialog, don't create a new node" +msgid "Close the dialog, do not create a new node" msgstr "Lukk dialogen og ikke opprett et nytt punkt." @@ -418,8 +417,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 @@ -428,5 +427,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 @@ -442,5 +441,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 #: ../plugins/terracer/src/terracer/TerracerAction.java:55 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45 #, java-format msgid "Tool: {0}" @@ -460,5 +459,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 @@ -467,8 +466,8 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:754 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -559,5 +558,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:394 msgid "Close open changesets" msgstr "Steng åpent endringsset" @@ -570,5 +569,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:43 @@ -582,10 +581,10 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:82 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:81 msgid "There are no open changesets" msgstr "Det er ingen åpne endringssett" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:83 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:82 msgid "No open changesets" msgstr "Ingen åpne endringsset" @@ -673,18 +672,18 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:210 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -729,65 +728,28 @@ msgstr "Last ned kartdata fra OSM-tjeneren." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:44 msgid "Download parent ways/relations..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:43 msgid "Download primitives referring to one of the selected primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183 -#, java-format -msgid "Id > 0 required, got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:236 -#: ../core/src/org/openstreetmap/josm/command/Command.java:66 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:71 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:87 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:216 -#: ../core/src/org/openstreetmap/josm/data/Bounds.java:51 -#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62 -#: ../core/src/org/openstreetmap/josm/data/Bounds.java:111 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1038 -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48 -#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 -#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:179 -#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:20 -#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:32 -#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:45 -#, java-format -msgid "Parameter ''{0}'' must not be null" -msgstr "Parameter ''{0}'' kan ikke vœre null" - -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:328 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:481 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "Det oppstod {0} konflikter under import." +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#, fuzzy, java-format +msgid "There was {0} conflict during import." +msgid_plural "There were {0} conflicts during import." +msgstr[0] "Det oppstod {0} konflikter under import." +msgstr[1] "Det oppstod {0} konflikter under import." #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231 -msgid "Conflicts during download" -msgstr "Konflikter under nedlasting" +#, fuzzy +msgid "Conflict during download" +msgid_plural "Conflicts during download" +msgstr[0] "Konflikter under nedlasting" +msgstr[1] "Konflikter under nedlasting" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256 @@ -808,5 +770,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369 msgid "Duplicate" msgstr "Fordoble" @@ -843,107 +805,20 @@ msgstr "Slå på og av Fullskjermvisning" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Eksporter til GPX …" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Eksporter dataene til GPX-fil." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 msgid "Nothing to export. Get some data first." msgstr "Ingenting å eksportere. Hent inn data først." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:172 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:174 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:268 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:39 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:112 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:51 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:99 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:249 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:124 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:426 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:123 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:82 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:96 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:112 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:126 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:141 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:158 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:121 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:123 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:135 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:341 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:54 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "Parameter ''{0}'' must not be null." -msgstr "parameter «{0}» må ha en verdi" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 -#, java-format -msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 msgid "Export GPX file" msgstr "Eksporter GPX fil" @@ -967,66 +842,74 @@ msgstr "Vis objektinformasjon om OSMs noder, linjer eller relasjoner." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114 msgid "Join overlapping Areas" msgstr "Slå sammen områder med overlapp" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114 msgid "Joins areas that overlap each other" msgstr "Slår sammen områder med overlapp" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:126 msgid "Please select at least one closed way that should be joined." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:132 msgid "Only up to two areas can be joined at the moment." msgstr "Bare to områder kan bli slått sammen foreløpig." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 -#, java-format -msgid "\"{0}\" is not closed and therefore can't be joined." +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:139 +#, java-format +msgid "\"{0}\" is not closed and therefore cannot be joined." msgstr "«{0}» er ikke lukket, og kan derfor ikke være med i sammenføyning." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 -msgid "" -"The selected way(s) have nodes outside of the downloaded data region.\n" -"This can lead to nodes being deleted accidentally.\n" -"Are you really sure to continue?" -msgstr "" -"De valgte linjene har noder utenfor nedlastet dataområde.\n" -"Dette kan medføre at noder blir slettet ved uhell.\n" -"Er du sikker på at du vil fortsette?" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#, fuzzy +msgid "The selected way has nodes outside of the downloaded data region." +msgid_plural "" +"The selected ways have nodes outside of the downloaded data region." +msgstr[0] "Valgt linje inneholder ikke valgt node." +msgstr[1] "Valgt linje inneholder ikke de valgte nodene." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 +msgid "This can lead to nodes being deleted accidentally." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:69 +msgid "Are you really sure to continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:70 msgid "Please abort if you are not sure" msgstr "Angre hvis du er usikker" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 msgid "No intersection found. Nothing was changed." msgstr "Fant ingen skjæring. Ingen endringer ble gjort." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193 msgid "Added node on all intersections" msgstr "Noder er lagt til i alle skjæringspunkt" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Slette indre linjer som ikke er del av multipolygon (relasjoner)" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 msgid "Fix relations" msgstr "Reparer relasjoner" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 msgid "Joined self-overlapping area" msgstr "Slo sammen områder som overlappet seg selv" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231 msgid "Joined overlapping areas" msgstr "Slo sammen overlappende områder" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1036,33 +919,33 @@ "oppstått." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297 msgid "Enter values for all conflicts." msgstr "Legg inn verdier for alle konflikter." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298 msgid "Solve Conflicts" msgstr "Løs konflikter" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313 msgid "Fix tag conflicts" msgstr "Reparer konflikter i egenskaper." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474 msgid "Removed Element from Relations" msgstr "Fjernede Element fra Relasjoner" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598 msgid "Join Areas: Remove Short Ways" msgstr "Slå sammen arealer: fjern korte linjer" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614 msgid "Closed Way" msgstr "Lukket linje" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902 msgid "Remove tags from inner ways" msgstr "Fjern egenskaper fra indre linjer" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Join Areas Function" msgstr "Funksjon Slå sammen Areal" @@ -1106,5 +989,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380 msgid "URL" msgstr "URL" @@ -1134,26 +1017,26 @@ msgstr "Flett det gjeldende laget inn i et annet lag" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48 msgid "Merge Nodes" msgstr "Samle noder" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 msgid "Merge nodes into the oldest one." msgstr "Samle noder i den eldste" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 msgid "Please select at least two nodes to merge." msgstr "Velg minst to noder til å samle" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:127 msgid "Abort Merging" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:129 msgid "Click to abort merging nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:136 #, java-format msgid "" @@ -1161,5 +1044,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:229 #, java-format msgid "Merge {0} nodes" @@ -1261,14 +1144,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:160 msgid "Opening 1 file..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:163 -#, java-format -msgid "Opening {0} files..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162 +#, fuzzy, java-format +msgid "Opening {0} file..." +msgid_plural "Opening {0} files..." +msgstr[0] "Åpner filer" +msgstr[1] "Åpner filer" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169 #, java-format msgid "Opening file ''{0}'' ..." @@ -1289,5 +1174,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70 -msgid "Select if the data should be downloaded in a new layer" +msgid "Select if the data should be downloaded into a new layer" msgstr "" @@ -1319,4 +1204,13 @@ msgid "Download Data" msgstr "Laster ned data" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +msgid "" +"When one or more ways are selected, the shape is adjusted such, that all " +"angles are 90 or 180 degrees.

You can add two nodes to the selection. " +"Then, the direction is fixed by these two reference nodes.(Afterwards, you " +"can undo the movement for certain nodes:
Select them and press the " +"shortcut for Orthogonalize / Undo. The default is Shift-Q.)" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 @@ -1460,6 +1354,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1470,11 +1364,11 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:91 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 @@ -1490,12 +1384,11 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:74 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:216 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:721 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679 @@ -1517,6 +1410,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:290 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 @@ -1632,6 +1524,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 -msgid "" -"Show status report with useful information that can be attached to bugs" +msgid "Show status report with useful information that can be attached to bugs" msgstr "Vis statusrapport med informasjon for feilsøking" @@ -1653,5 +1544,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:929 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1666,9 +1557,9 @@ msgstr "Slett overflødige noder fra en linje." -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85 msgid "Please select at least one way to simplify." msgstr "Velg minst én linje å forenkle." -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:89 #, java-format msgid "The selection contains {0} way. Are you sure you want to simplify it?" @@ -1676,12 +1567,11 @@ "The selection contains {0} ways. Are you sure you want to simplify them all?" msgstr[0] "Utvalget har {0} linje. Er du sikker på at du vil forenkle denne?" -msgstr[1] "" -"Utvalget har {0} linjer. Er du sikker på at du vil forenkle disse?" - -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90 +msgstr[1] "Utvalget har {0} linjer. Er du sikker på at du vil forenkle disse?" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:92 msgid "Are you sure?" msgstr "Er du sikker?" -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:139 #: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format @@ -1774,47 +1664,46 @@ msgstr "Slår av/på global innstilling «{0}»." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54 msgid "UnGlue Ways" msgstr "Fjern knytning til linjer" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "Duplicate nodes that are used by multiple ways." msgstr "Dupliser noder som er med i flere linjer." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 msgid "This node is not glued to anything else." msgstr "Denne noden har ikke knytninger" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of these nodes are glued to anything else." msgstr "Ingen av disse nodene har knytninger." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 -msgid "None of this way's nodes are glued to anything else." +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:106 +msgid "None of this way''s nodes are glued to anything else." msgstr "Ingen noder i denne linjen har andre knytninger." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "The current selection cannot be used for unglueing." msgstr "Valgte element har ikke knytninger som kan løses." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "Select either:" msgstr "Velg:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One tagged node, or" msgstr "* En node med egenskaper, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "* One node that is used by more than one way, or" msgstr "– En node som brukes av flere linjer, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 -msgid "" -"* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "* One node that is used by more than one way and one of those ways, or" msgstr "– En node som er brukt av flere linjer, og en av linjene, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1822,10 +1711,10 @@ "– En linje som har en eller flere noder, som er brukt av flere linjer, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "– En linje, og en eller flere av nodene som er brukt i flere linjer." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1838,18 +1727,19 @@ "kopier og alle noder bli valgt." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166 msgid "Unglued Node" msgstr "Node uten tilknytning" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 #, java-format msgid "Dupe into {0} nodes" msgstr "Kopier til {0} noder" -#. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 -#, java-format -msgid "Dupe {0} nodes into {1} nodes" -msgstr "Kopier {0} noder til {1} noder" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#, fuzzy, java-format +msgid "Dupe {0} node into {1} nodes" +msgid_plural "Dupe {0} nodes into {1} nodes" +msgstr[0] "Kopier {0} noder til {1} noder" +msgstr[1] "Kopier {0} noder til {1} noder" #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 @@ -1891,7 +1781,7 @@ #. bounds defined? => use the bbox downloader -#. +#. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:971 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977 msgid "Download data" msgstr "Last ned data" @@ -1913,6 +1803,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format -msgid "Didn''t find an object with id {0} in the current dataset" -msgstr "" +msgid "Did not find an object with id {0} in the current dataset" +msgstr "Fant ikke noe objekt med ID {0} i dette datasettet" #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 @@ -1951,6 +1841,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 msgid "No changes to upload." msgstr "Ingen endringer å laste opp." @@ -1960,9 +1850,9 @@ msgstr "Ingen endringer å laste opp. Finn frem data først." -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45 msgid "Upload selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47 msgid "Upload all changes in the current selection to the OSM server." msgstr "" @@ -2009,50 +1899,56 @@ msgstr "Zoom ut" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365 -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:20 +msgctxt "audio" msgid "Back" msgstr "Tilbake" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgctxt "audio" msgid "Jump back." msgstr "Hopp tilbake." -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:15 #, java-format msgid "Audio: {0}" msgstr "Audio: {0}" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:15 +msgctxt "audio" msgid "Faster" msgstr "Raskere" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgctxt "audio" msgid "Faster Forward" msgstr "Rask Avspilling" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:19 +msgctxt "audio" msgid "Forward" msgstr "Spill av" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgctxt "audio" msgid "Jump forward" msgstr "Neste spor" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:18 +msgctxt "audio" msgid "Next Marker" msgstr "Neste merke" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgctxt "audio" msgid "Play next marker." msgstr "Spill fra neste merke" @@ -2060,4 +1956,5 @@ #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgctxt "audio" msgid "Play/Pause" msgstr "Spill/Pause" @@ -2067,19 +1964,23 @@ msgstr "Spill/Pause audio." -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:18 +msgctxt "audio" msgid "Previous Marker" msgstr "Forrige merke" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgctxt "audio" msgid "Play previous marker." msgstr "Spill av forrige merke" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:15 +msgctxt "audio" msgid "Slower" msgstr "Saktere" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgctxt "audio" msgid "Slower Forward" msgstr "Spill av sakte" @@ -2141,12 +2042,12 @@ "deleted on the server. If you later try to delete or
update them the " "server is likely to report a
conflict.

Click {1} " -"to check the state of these primitives
on the server.
Click " -"{2} to ignore.
" +"to check the state of these primitives
on the server.
Click {2}" +" to ignore.
" msgstr "" "Det er {0} elementer i det lokale datasettet som
kan være slettet " "på tjeneren. Hvis du senere prøver å slette
eller oppdatere dem, vil " -"tjeneren sannsynligvis rapportere om en
konflikt.

Trykk " -"{1} for å sjekke status for disse elementene
på " -"tjeneren.
Trykk {2} for å ignorere.
" +"tjeneren sannsynligvis rapportere om en
konflikt.

Trykk {1}" +" for å sjekke status for disse elementene
på tjeneren.
Trykk " +"{2} for å ignorere.
" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183 @@ -2168,13 +2069,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 msgid "Delete Mode" msgstr "Slettemodus" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 msgid "Delete nodes or ways." msgstr "Slett noder eller linjer." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 @@ -2186,7 +2087,7 @@ msgstr "Modus: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:245 -msgid "" -"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:246 +msgid "" +"Click to delete. Shift: delete way segment. Alt: do not delete unused nodes " "when deleting a way. Ctrl: delete referring objects." msgstr "" @@ -2294,16 +2195,16 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 msgid "" -"Drag play head and release near track to play audio from there; " -"SHIFT+release to synchronize audio at that point." -msgstr "" -"Dra og slipp avspillingsmarkør der du vil avspilling skal starte; " -"Shift+slipp synkroniserer audio i dette punktet." +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"Dra og slipp avspillingsmarkør der du vil avspilling skal starte; Shift" +"+slipp synkroniserer audio i dette punktet." #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:145 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104 msgid "Select" @@ -2382,10 +2283,47 @@ "piltaster; flytt utsnitt med høyre museknapp" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25 +#, fuzzy +msgid "" +msgstr "nord" + +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27 +msgid "" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:50 msgid "Search..." msgstr "Søk …" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137 msgid "Search for objects." @@ -2393,60 +2331,60 @@ #. -- prepare the combo box with the search expressions -#. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#. +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 msgid "Please enter a search string." msgstr "Skriv inn søketekst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "Enter the search expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "replace selection" msgstr "erstatt utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "add to selection" msgstr "legg til i utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 msgid "remove from selection" msgstr "fjern fra utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "case sensitive" msgstr "skill mellom store/små bokstaver" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "regular expression" msgstr "regulært uttrykk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 +msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "Nansens gate – «Nansens» og «gate» i nøkkel eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "\"Nansens gate\" – «Nansens gate» i nøkkel eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 -msgid "name:Bak - 'Bak' anywhere in the name." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Nan – «Nan» finnes innen navnet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 -msgid "type=route - key 'type' with value exactly 'route'." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route – nøkkel «type» med eksakt verdi «route»." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +msgid "" +"type=* - key ''type'' with any value. Try also *=value, " "type=, *=*, *=" msgstr "" @@ -2454,35 +2392,38 @@ "*=value, type=, *=*, *=." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 -msgid "-name:Bak - not 'Bak' in the name." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Nan – «Nan» finnes ikke innen navnet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +msgid "oneway? - oneway=yes, true, 1 or on" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 msgid "foot: - key=foot set to any value." msgstr "foot: – nøkkel «foot» med hvilken som helst verdi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "Special targets:" msgstr "Spesialsøk:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "" "type: - type of the object (node, way, relation)" -msgstr "" -"type: – type objekt (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +msgstr "type: – type objekt (node, way, relation)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "user:... - all objects changed by user" msgstr "user:… – alle objekter redigert av angitt bruker" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "" "version:... - object with given version (0 objects without an " @@ -2490,5 +2431,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2496,11 +2437,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 -msgid "" -"nodes:... - object with given number of nodes (nodes:count or " -"nodes:min-max)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2508,5 +2449,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2514,21 +2455,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "modified - all changed objects" msgstr "modified – alle endrede objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "selected - all selected objects" msgstr "selected – alle objekter i utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "incomplete - all incomplete objects" msgstr "incomplete – alle uferdige objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "untagged - all untagged objects" msgstr "untagged – alle objekter uten egenskaper" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "" "child expr - all children of objects matching the expression" @@ -2536,5 +2477,5 @@ "child uttrykk – alle underobjekter av objektene i uttrykket" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 msgid "" "parent expr - all parents of objects matching the expression" @@ -2542,13 +2483,13 @@ "parent uttrykk – alle overobjekter av objektene i uttrykket" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Use | or OR to combine with logical or" msgstr "Bruk | eller OR for søk med logisk eller" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:143 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:144 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2556,11 +2497,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145 msgid "Use ( and ) to group expressions" msgstr "Bruk ( og ) for å gruppere uttrykk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:49 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2568,51 +2509,60 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137 msgid "Search" msgstr "Søk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:157 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:157 msgid "Start Search" msgstr "Start søk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:277 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:279 #, java-format msgid "No match found for ''{0}''" msgstr "Fant ingen treff for «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Ingenting lagt til utvalg ved søk etter «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Ingenting fjernet fra utvalg ved søk etter «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:293 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:295 #, java-format msgid "Found {0} matches" msgstr "Fant {0} treff" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:321 +#. case sensitive +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324 +#, fuzzy +msgctxt "search" msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:321 +#. case insensitive +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325 +#, fuzzy +msgctxt "search" msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:322 +#. regex search +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327 +#, fuzzy +msgctxt "search" msgid "RX" msgstr "RX" @@ -2629,41 +2579,42 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" "Nøkkel kan ikke være tom når egenskap-operatoren brukes. Bruk: nøkkel=verdi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:422 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:440 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "Ukjent objekttype: {0}. Tillatte verdier er node, way og relation" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Unexpected token: {0}" msgstr "Uventet symbol: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:634 msgid "Missing parameter for OR" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:643 -msgid "Missing right parenthesis" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656 +#, fuzzy, java-format +msgid "Unexpected token. Expected {0}, found {1}" +msgstr "Uventet symbol: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659 msgid "Missing operator for NOT" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712 #, java-format msgid "" @@ -2672,9 +2623,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:722 msgid "Wrong number of parameters for nodes operator." msgstr "Feil antall parametere for nodes-operator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:724 #, java-format msgid "" @@ -2685,15 +2636,15 @@ "intervall, for eksempel nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:716 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:731 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." msgstr "Ugyldig verdi for id-operator: {0}. Verdien må være et tall." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:722 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:737 #, java-format msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:729 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:744 #, java-format msgid "Incorrect value of version operator: {0}. Number is expected." @@ -2720,6 +2671,5 @@ #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "" -"{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}" +msgstr "{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 @@ -2735,5 +2685,5 @@ msgid "" "{0} relations build a cycle because they refer to each other.
JOSM " -"can''t upload them. Please edit the relations and remove the cyclic " +"cannot upload them. Please edit the relations and remove the cyclic " "dependency." msgstr "" @@ -2767,7 +2717,9 @@ #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49 -#, java-format -msgid "Added {0} objects" -msgstr "" +#, fuzzy, java-format +msgid "Added {0} object" +msgid_plural "Added {0} objects" +msgstr[0] "Endre {0} objekt" +msgstr[1] "Endre {0} objekt" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 @@ -2817,20 +2769,11 @@ #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 +#, fuzzy, java-format +msgid "Remove \"{0}\" for {1} objects" +msgstr "Fjern «{0}» i {1} {2}" + #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:75 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 -msgid "object" -msgid_plural "objects" -msgstr[0] "objekt" -msgstr[1] "objekter" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "Fjern «{0}» i {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118 -#, java-format -msgid "Set {0}={1} for {2} {3}" +#, fuzzy, java-format +msgid "Set {0}={1} for {2} objects" msgstr "Sett {0}={1} i {2} {3}" @@ -2844,9 +2787,9 @@ msgid "" "Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " -"conflict can't be added." +"conflict cannot be added." msgstr "" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Double conflict" msgstr "" @@ -2855,5 +2798,5 @@ #, java-format msgid "" -"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for " +"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " "primitive ''{1}''." msgstr "" @@ -2865,10 +2808,12 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:204 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 #, java-format msgid "" -"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "" +"Cannot undo command ''{0}'' because layer ''{1}'' is not present any more" +msgstr "" +"Kan ikke gjøre om kommando \"{0}\" fordi lag \"{1}\" ikke lenger er " +"tilgjengelig" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 @@ -2883,14 +2828,23 @@ msgstr "kan ikke løse uavgjort konflikt" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:57 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:103 -#, java-format -msgid "Parameter ''{0}'' must not be empty" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:61 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 msgid "At least one object to delete required, got empty collection" msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 +#, fuzzy, java-format +msgid "Delete node {0}" +msgstr "Slettemodus" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162 +#, fuzzy, java-format +msgid "Delete way {0}" +msgstr "Valgt spor: {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163 +#, fuzzy, java-format +msgid "Delete relation {0}" +msgstr "Slett fra relasjon" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177 @@ -2924,16 +2878,15 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:436 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144 -msgid "" -"You are about to delete nodes outside of the area you have " -"downloaded.
This can cause problems because other objects (that you don't " -"see) might use them.
Do you really want to delete?" +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you do not see) " +"might use them.
Do you really want to delete?" msgstr "" "Du er i ferd med å slette noder utenfor nedlastet område.
Dette kan skape " -"problemer fordi de kan være i bruk av andre objekter (som du ikke kan se nå) " -".
Er du sikker på at du vil slette nodene?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 +"problemer fordi de kan være i bruk av andre objekter (som du ikke kan se " +"nå) .
Er du sikker på at du vil slette nodene?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 msgid "Delete confirmation" msgstr "" @@ -2946,15 +2899,15 @@ #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 #, java-format -msgid "Set the 'modified' flag for node {0}" +msgid "Set the ''modified'' flag for node {0}" msgstr "" #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 #, java-format -msgid "Set the 'modified' flag for way {0}" +msgid "Set the ''modified'' flag for way {0}" msgstr "" #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 #, java-format -msgid "Set the 'modified' flag for relation {0}" +msgid "Set the ''modified'' flag for relation {0}" msgstr "" @@ -2966,15 +2919,17 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:101 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:102 #, java-format msgid "Purged object ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 -#, java-format -msgid "Purged {0} objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 +#, fuzzy, java-format +msgid "Purged {0} object" +msgid_plural "Purged {0} objects" +msgstr[0] "Endre {0} objekt" +msgstr[1] "Endre {0} objekt" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155 #, java-format msgid "" @@ -2985,5 +2940,5 @@ "er {1}." -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "Removing reference from relation {0}" @@ -3022,22 +2977,24 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 -#, java-format -msgid "Undelete {0} primitives" -msgstr "Gjenopprett {0} objekter" +#, fuzzy, java-format +msgid "Undelete {0} primitive" +msgid_plural "Undelete {0} primitives" +msgstr[0] "Gjenopprett {0} objekter" +msgstr[1] "Gjenopprett {0} objekter" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, java-format -msgid "Resolve version conflicts for node {0}" -msgstr "" +#, fuzzy, java-format +msgid "Resolve version conflict for node {0}" +msgstr "Løs koordinatkonflikter i {0}" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, java-format -msgid "Resolve version conflicts for way {0}" -msgstr "" +#, fuzzy, java-format +msgid "Resolve version conflict for way {0}" +msgstr "Løs koordinatkonflikter i {0}" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, java-format -msgid "Resolve version conflicts for relation {0}" -msgstr "" +#, fuzzy, java-format +msgid "Resolve version conflict for relation {0}" +msgstr "Løs medlemskonflikter i relasjon {0}" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 @@ -3097,5 +3054,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 -msgid "Don't apply changes" +msgid "Do not apply changes" msgstr "Ikke bruk endringer" @@ -3116,19 +3073,4 @@ msgstr "Korriger egenskap automatisk" -#: ../core/src/org/openstreetmap/josm/data/Bounds.java:53 -#, java-format -msgid "Expected array of length 4, got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Bounds.java:65 -#, java-format -msgid "Exactly four doubles excpected in string, got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Bounds.java:71 -#, java-format -msgid "Illegal double value ''{0}''" -msgstr "" - #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:79 @@ -3143,10 +3085,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Bounds.java:113 -#: ../core/src/org/openstreetmap/josm/data/Bounds.java:115 -#, java-format -msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "" - #: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 #, java-format @@ -3160,15 +3096,17 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 -#, java-format -msgid "" -"Warning: Failed to initialize preferences. Preference directory ''{0}'' " -"isn't a directory." -msgstr "" +#, fuzzy, java-format +msgid "" +"Warning: Failed to initialize preferences. Preference directory ''{0}'' is " +"not a directory." +msgstr "" +"Klarte ikke sette referanse. Referanse-ID {0} er ikke tilgjengelig i " +"historikken." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" -"Failed to initialize preferences.
Preference directory ''{0}'' " -"isn't a directory." +"Failed to initialize preferences.
Preference directory ''{0}'' is " +"not a directory." msgstr "" @@ -3210,6 +3148,6 @@ #, java-format msgid "" -"Preferences file had errors.
Making backup of old one to " -"
{0}
and creating a new default preference file." +"Preferences file had errors.
Making backup of old one to
{0}" +"
and creating a new default preference file." msgstr "" @@ -3282,8 +3220,8 @@ #: ../core/src/org/openstreetmap/josm/data/Version.java:140 -msgid "Warning: the revision file '/REVISION' is missing." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 +msgid "Warning: the revision file ''/REVISION'' is missing." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:76 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3292,5 +3230,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3299,5 +3237,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3305,20 +3243,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:85 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86 +msgctxt "compass" msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87 +msgctxt "compass" msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:99 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100 +msgctxt "compass" msgid "W" msgstr "V" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101 +msgctxt "compass" msgid "E" msgstr "Ø" @@ -3327,5 +3269,5 @@ #, java-format msgid "" -"Unable to add primitive {0} to the dataset because it's already included" +"Unable to add primitive {0} to the dataset because it is already included" msgstr "" @@ -3333,5 +3275,5 @@ #, java-format msgid "" -"JOSM expected to find primitive [{0} {1}] in dataset but it's not there. " +"JOSM expected to find primitive [{0} {1}] in dataset but it is not there. " "Please report this at http://josm.openstreetmap.de . This is not a critical " "error, it should be safe to continue in your work." @@ -3366,10 +3308,10 @@ #. should not happen -#. +#. #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" "Target object with id {0} and version {1} is visible although source object " -"with lower version {2} is not visible. Can''t deal with this inconsistency. " +"with lower version {2} is not visible. Cannot deal with this inconsistency. " "Keeping target object. " msgstr "" @@ -3384,4 +3326,5 @@ #. column header: hide filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgctxt "filter" msgid "H" msgstr "" @@ -3389,19 +3332,25 @@ #. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 +msgctxt "filter" msgid "Text" -msgstr "" +msgstr "tekst" #. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 +#, fuzzy +msgctxt "filter" msgid "C" -msgstr "" +msgstr "CS" #. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 +#, fuzzy +msgctxt "filter" msgid "I" -msgstr "" +msgstr "CI" #. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 +msgctxt "filter" msgid "M" msgstr "" @@ -3410,9 +3359,12 @@ #. filter mode: replace #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 +#, fuzzy +msgctxt "filter" msgid "R" -msgstr "" +msgstr "RX" #. filter mode: add #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 +msgctxt "filter" msgid "A" msgstr "" @@ -3420,4 +3372,5 @@ #. filter mode: remove #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 +msgctxt "filter" msgid "D" msgstr "" @@ -3425,60 +3378,40 @@ #. filter mode: in selection #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 +msgctxt "filter" msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:264 -#, java-format -msgid "Expected ID >= 0. Got {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:401 -msgid "A primitive with ID = 0 can't be invisible." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:458 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403 +msgid "A primitive with ID = 0 cannot be invisible." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:652 -#, java-format -msgid "Parameter ''{0}'' >= 0 expected, got {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 -#, java-format -msgid "" -"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is " "{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1040 -msgid "" -"Can't merge because either of the participating primitives is new and the " +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041 +msgid "" +"Cannot merge because either of the participating primitives is new and the " "other is not" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1042 -#, java-format -msgid "" -"Can''t merge primitives with different ids. This id is {0}, the other is {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37 -#, java-format -msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''." -msgstr "parameter «{0}» er ikke et gyldig typenavn – leste «{1}»" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:48 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:55 -#, java-format -msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''." -msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{1}»" +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043 +#, java-format +msgid "" +"Cannot merge primitives with different ids. This id is {0}, the other is {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572 @@ -3487,5 +3420,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628 msgid "" -"Tag collection can't be applied to a primitive because there are keys with " +"Tag collection cannot be applied to a primitive because there are keys with " "multiple values." msgstr "" @@ -3497,32 +3430,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 -#, java-format -msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 -#, java-format -msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''." -msgstr "parameter «{0}» i intervall 0–{1} forventet – leste {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34 -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:88 -#, java-format -msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." -msgstr "Parameter «{0}» > 0 forventet – leste «{1}»." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:115 -#, java-format -msgid "" -"Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112 +#, java-format +msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48 #, java-format @@ -3571,17 +3481,17 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:323 -msgid "The \"from\" way doesn't start or end at a \"via\" node." +msgid "The \"from\" way does not start or end at a \"via\" node." msgstr "Linje med «from» har ikke start eller slutt i en «via»-node." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327 -msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgid "The \"to\" way does not start or end at a \"via\" node." msgstr "Linje med \"to\" har ikke start eller slutt i \"via\"-node." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355 -msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgid "The \"from\" way does not start or end at the \"via\" way." msgstr "Linje med «from» har ikke start eller slutt i en «via»-linje." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:359 -msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgid "The \"to\" way does not start or end at the \"via\" way." msgstr "linje med «to» har ikke start eller slutt i en «via»-linje." @@ -3659,5 +3569,5 @@ #. darker blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" @@ -3789,6 +3699,5 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 #, java-format -msgid "" -"Could not read bookmarks from
''{0}''
Error was: {1}" +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" msgstr "" @@ -3823,5 +3732,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3051 msgid "railway" msgstr "jernbane" @@ -3840,5 +3749,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 @@ -3867,33 +3776,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:75 msgid "Precondition violation" msgstr "Forhåndsbetingelse brutt" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 msgid "Security exception" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:126 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:127 msgid "Network exception" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:145 msgid "IO Exception" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:177 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:178 msgid "Internal Server Error" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:193 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:194 msgid "Bad Request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:209 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:210 msgid "Not Found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 @@ -3901,17 +3810,22 @@ msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:249 msgid "Authentication Failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 msgid "Authorisation Failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:282 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 +#, fuzzy +msgid "Authenticationi failed" +msgstr "Tilkobling mislykkes" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:299 msgid "Unknown host" msgstr "Ukjent vert" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:385 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:407 msgid "Object deleted" msgstr "" @@ -3936,6 +3850,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:84 -#: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:102 +#: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:104 #, java-format msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''" @@ -3967,6 +3880,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -msgstr "" -"Endre vinduets størrelse til oppgitt geometri (format: BREDDExHØYDE)" +msgstr "Endre vinduets størrelse til oppgitt geometri (format: BREDDExHØYDE)" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 @@ -4006,6 +3918,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "If specified, reset the configuration instead of reading it." -msgstr "" -"Hvis angitt, gå til standardinnstillinger i stedet for å lese dem inn." +msgstr "Hvis angitt, gå til standardinnstillinger i stedet for å lese dem inn." #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 @@ -4097,5 +4008,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "" -"Parameters --download, --downloadgps and --selection are processed in this " +"Parameters --download, --downloadgps, and --selection are processed in this " "order." msgstr "" @@ -4105,34 +4016,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Klargjør" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Updating plugins..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:176 msgid "Installing updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:175 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:180 msgid "Loading early plugins" msgstr "Laster første programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:184 msgid "Setting defaults" msgstr "Setter standardverdier" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:184 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Creating main GUI" msgstr "Bygger opp hovedskjermbilde" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Loading plugins" msgstr "Laster inn programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:224 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -4145,14 +4056,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:193 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643 msgid "Edit" msgstr "Endre" @@ -4223,29 +4134,29 @@ msgstr "målestokk" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The geographic longitude at the mouse pointer." msgstr "Lengdegrad ved musepekeren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The name of the object at the mouse pointer." msgstr "Navn på objekt ved musepeker" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103 msgid "The geographic latitude at the mouse pointer." msgstr "Breddegrad ved musepekeren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104 msgid "The angle between the previous and the current way segment." msgstr "Vinkel mellom forrige og nåværende linjesegment." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105 msgid "The (compass) heading of the line segment being drawn." msgstr "Kompassretning på segmentet som tegnes." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106 msgid "The length of the new way segment being drawn." msgstr "Lengden på segmentet som tegnes." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4253,19 +4164,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299 msgid "(no object)" msgstr "(intet objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:371 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:376 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:393 msgid "Layer not in list." msgstr "Laget er ikke i lista." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:619 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:628 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4342,5 +4253,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:477 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4358,5 +4269,5 @@ #. * #. * compare my version of an {@see OsmPrimitive} with their version -#. +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17 msgid "My with Their" @@ -4365,5 +4276,5 @@ #. * #. * compare my version of an {@see OsmPrimitive} with the merged version -#. +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22 msgid "My with Merged" @@ -4372,5 +4283,5 @@ #. * #. * compare their version of an {@see OsmPrimitive} with the merged veresion -#. +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27 msgid "Their with Merged" @@ -4382,14 +4293,14 @@ msgstr "rolle {0} deltar ikke i sammenlikningspar {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:102 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:107 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 @@ -4397,6 +4308,6 @@ msgstr "Egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:112 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:243 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4404,30 +4315,34 @@ msgstr "Noder" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:117 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:166 msgid "No pending tag conflicts to be resolved" msgstr "Ingen gjenværende egenskapskonflikter å løse" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 -#, java-format -msgid "Tags({0} conflicts)" -msgstr "Egenskaper ({0} konflikter)" - #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 -#, java-format -msgid "{0} pending tag conflicts to be resolved" -msgstr "{0} gjenværende egenskapskonflikter å løse" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#, fuzzy, java-format +msgid "Tags({0} conflict)" +msgid_plural "Tags({0} conflicts)" +msgstr[0] "Egenskaper ({0} konflikter)" +msgstr[1] "Egenskaper ({0} konflikter)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170 +#, fuzzy, java-format +msgid "{0} pending tag conflict to be resolved" +msgid_plural "{0} pending tag conflicts to be resolved" +msgstr[0] "{0} gjenværende egenskapskonflikter å løse" +msgstr[1] "{0} gjenværende egenskapskonflikter å løse" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "Nodes(resolved)" msgstr "Noder (løst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4436,17 +4351,17 @@ "linjas nodeliste." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Nodes(with conflicts)" msgstr "Noder (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:182 msgid "Pending conflicts in the node list of this way" msgstr "Gjenværende konflikter i denne veiens nodeliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "Members(resolved)" msgstr "Medlemmer (løst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4456,68 +4371,62 @@ "denne relasjonens medlemsliste." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Members(with conflicts)" msgstr "Medlemmer (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the member list of this relation" msgstr "Gjenværende konflikter i denne relasjonens medlemsliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "No pending property conflicts" msgstr "Ingen gjenværende egenskapskonflikter" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Properties(with conflicts)" msgstr "Egenskaper (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:203 msgid "Pending property conflicts to be resolved" msgstr "Gjenværende egenskapskonflikter å løse" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 msgid "Conflict Resolution" msgstr "Konfliktløsning" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:322 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:374 -#, java-format -msgid "Parameter current out of range. Got {0}." -msgstr "parameter «current» utenfor rekkevidde: leste {0}" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:586 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:610 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "Liste i rolle {0} er for øyeblikket ikke med i et sammenlikningspar." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:759 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "Uventet verdi for parameter «index». Leste {0}." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:773 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774 #, java-format msgid "Item {0} not found in list." msgstr "fant ikke {0} i liste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "synkron rulling" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "Sammenlikn " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Lokal versjon" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "Liste over elementer i det lokale datasettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4525,5 +4434,5 @@ msgstr "Sammenslått versjon" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4533,18 +4442,18 @@ "sammenslåingsvalgene tas i bruk." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Tjenerversjon" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "Liste over elementer i tjenerens datasett" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> topp" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" @@ -4552,9 +4461,9 @@ "elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "> bunn" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" @@ -4562,5 +4471,5 @@ "elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4570,5 +4479,5 @@ "over sammenslåtte elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4578,5 +4487,5 @@ "lista over sammenslåtte elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4585,12 +4494,11 @@ "elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 -msgid "" -"Copy their selected elements to the end of the list of merged elements." +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" "Kopier valgte elementer på tjeneren til slutten av lista over sammenslåtte " "elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4600,5 +4508,5 @@ "lista over sammenslåtte elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4608,23 +4516,23 @@ "i lista over sammenslåtte elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "Opp" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "Flytt valgte elementer opp én plass" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "Ned" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "Flytt valgte elementer ned én plass" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4635,45 +4543,45 @@ msgstr "Fjern" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "Fjern de valgte elementene fra lista over sammenslåtte elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "Lås" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Lås gjeldende liste over sammenslåtte elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "Lås opp" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "Lås opp lista over sammenslåtte elementer og begynn sammenslåing" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 -#, java-format -msgid "" -"Click {0} to start merging my and their " -"entries." +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:779 +#, java-format +msgid "" +"Click {0} to start merging my and their entries." msgstr "" "Trykk {0} for å begynne sammenslåingen av lokal- og " "tjeneroppføringer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 -#, java-format -msgid "" -"Click {0} to finish merging my and their " -"entries." +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:784 +#, java-format +msgid "" +"Click {0} to finish merging my and their entries." msgstr "" "Trykk {0} for å avslutte sammenslåingen av lokal- og " "tjeneroppføringer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:802 #, java-format msgid "My version ({0} entry)" @@ -4682,5 +4590,5 @@ msgstr[1] "Lokal versjon ({0} oppføringer)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:805 #, java-format msgid "Merged version ({0} entry)" @@ -4689,5 +4597,5 @@ msgstr[1] "Sammenslått versjon ({0} oppføringer)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:808 #, java-format msgid "Their version ({0} entry)" @@ -4696,13 +4604,13 @@ msgstr[1] "Tjenerens versjon ({0} oppføringer)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:871 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" -"Adjustable {0} not registered yet. Can't set participation in synchronized " +"Adjustable {0} not registered yet. Cannot set participation in synchronized " "adjustment." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:886 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -4714,23 +4622,16 @@ msgstr "Node" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 -msgid "Merged nodes not frozen yet. Can't build resolution command." -msgstr "" -"Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando." - -#. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:180 -#, java-format -msgid "Unexpected column index. Got {0}." -msgstr "Uventet kolonneindeks: {0}" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 +msgid "Merged nodes not frozen yet. Cannot build resolution command." +msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" -"An error occurred while communicating with the server
Details: " -"{0}" -msgstr "" -"Det oppstod en feil under kommunikasjon med tjeneren.
Detaljer: " -"{0}" +"An error occurred while communicating with the server
Details: {0}" +msgstr "" +"Det oppstod en feil under kommunikasjon med tjeneren.
Detaljer: {0}" +"" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 @@ -4739,37 +4640,48 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 msgid "Yes, undelete them too" msgstr "Ja, gjenopprett også dem" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:500 msgid "No, cancel operation" msgstr "Nei, avbryt operasjonen" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 -#, java-format -msgid "" -"There are {0} additional nodes used by way {1}
which are deleted on " -"the server.

Do you want to undelete these nodes too?" -msgstr "" -"Ytterligere {0} noder i bruk av linje {1},
er slettet på " -"tjeneren.

Vil du gjenopprette også disse nodene?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 +#, fuzzy, java-format +msgid "" +"There is {0} additional node used by way {1}
which is deleted on the " +"server.

Do you want to undelete this node too?" +msgid_plural "" +"There are {0} additional nodes used by way {1}
which are deleted on the " +"server.

Do you want to undelete these nodes too?" +msgstr[0] "" +"Ytterligere {0} noder i bruk av linje {1},
er slettet på tjeneren." +"

Vil du gjenopprette også disse nodene?" +msgstr[1] "" +"Ytterligere {0} noder i bruk av linje {1},
er slettet på tjeneren." +"

Vil du gjenopprette også disse nodene?" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480 msgid "Undelete additional nodes?" msgstr "Gjenopprette ytterligere noder?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 -#, java-format -msgid "" -"There are {0} additional primitives referred to by relation " -"{1}
which are deleted on the server.

Do you want to undelete them " -"too?" -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 +#, fuzzy, java-format +msgid "" +"There is {0} additional primitive referred to by relation {1}
which is " +"deleted on the server.

Do you want to undelete this too?" +msgid_plural "" +"There are {0} additional primitives referred to by relation {1}
which are " +"deleted on the server.

Do you want to undelete these too?" +msgstr[0] "" "Ytterligere {0} objekter med henvisninger i relasjon {1},
er " "slettet på tjeneren.

Vil du gjenopprette også dem?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 +msgstr[1] "" +"Ytterligere {0} objekter med henvisninger i relasjon {1},
er " +"slettet på tjeneren.

Vil du gjenopprette også dem?" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514 msgid "Undelete dependent primitives?" msgstr "Gjenopprette avhengige objekter?" @@ -4916,8 +4828,7 @@ msgstr "Objekt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114 -msgid "Merged nodes not frozen yet. Can't build resolution command" -msgstr "" -"Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando." +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111 +msgid "Merged nodes not frozen yet. Cannot build resolution command" +msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 @@ -4949,6 +4860,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:196 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:448 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4962,6 +4873,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:227 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:448 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4974,13 +4885,7 @@ msgstr "Verdi" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:99 msgid "Cannot apply undecided tag merge item." msgstr "Kan ikke bruke uavgjort sammenslåing for egenskap" - -#. should not happen, but just in case -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39 -#, java-format -msgid "Parameter 'col' must be 0 or 1. Got {0}." -msgstr "Parameter «col» må være 0 eller 1. Leste {0}." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126 @@ -4992,9 +4897,4 @@ msgstr "Tjenerens datasett" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 -msgid ">" -msgstr ">" - #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" @@ -5050,10 +4950,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 msgid "Apply" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22 msgid "none" @@ -5061,5 +4961,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2151 msgid "all" msgstr "alle" @@ -5088,22 +4988,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 -#, java-format -msgid "Parameter ''{0}'' must not be empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 -#, java-format -msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}." -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 -msgid "Tag collection doesn't include the selected value ''{0}''." -msgstr "" +#, fuzzy, java-format +msgid "Tag collection does not include the selected value ''{0}''." +msgstr "Valgt linje inneholder ikke valgt node." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:250 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 msgid "Not decided yet." msgstr "" @@ -5148,5 +5039,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 @@ -5158,5 +5049,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format @@ -5271,29 +5162,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161 msgid "For selected objects only" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:167 -msgid "" -"Select to show changesets for the currently selected objects " -"only.
Unselect to show all changesets for objects in the current data " -"layer." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:162 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124 msgid "Changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:260 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:255 msgid "Open the list of changesets in the current layer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:305 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:300 msgid "Select all objects assigned to the currently selected changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:359 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 @@ -5301,27 +5192,26 @@ msgstr "Last ned" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:365 -msgid "" -"Download information about the selected changesets from the OSM server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 +msgid "Download information about the selected changesets from the OSM server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:395 msgid "Closes the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:176 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:426 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 msgid "Show info" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:427 msgid "Open a web page for each selected changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:466 msgid "Details" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:467 msgid "Opens the Changeset Manager window for the selected changesets" msgstr "" @@ -5339,11 +5229,11 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5365,13 +5255,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Resolve" msgstr "Løs" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338 msgid "Open a merge dialog of all selected items in the list above." msgstr "Åpne en dialog for å sammenføye element i lista ovenfor." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 @@ -5403,10 +5293,9 @@ #, java-format msgid "" -"You didn''t finish to merge the differences in this " -"conflict.
Conflict resolutions won't be applied unless all " -"differences
are resolved.Click {0} to close " -"anyway.Already
resolved differences won't be " -"applied.
Click {1} to return to resolving " -"conflicts." +"You did not finish to merge the differences in this conflict." +"
Conflict resolutions won't be applied unless all differences
are " +"resolved.Click {0} to close anyway." +"Already
resolved differences won't be applied.
Click " +"{1} to return to resolving conflicts." msgstr "" @@ -5424,17 +5313,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:49 msgid "Filter objects and hide/disable them." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5481,18 +5370,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 msgid "History" msgstr "Historikk" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68 msgid "Display the history of all selected items." msgstr "Vis historikk på alle valgte objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:254 msgid "Object with history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 @@ -5502,59 +5391,55 @@ msgstr "Last inn på nytt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272 msgid "Reload all currently selected objects and refresh the list." msgstr "Les inn og oppfrisk liste over alle valgte objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 msgid "Show" msgstr "Vis" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:312 msgid "Display the history of the selected objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83 -msgid "Dialog not created yet. Invoke createInstance() first" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149 msgid "Layers" msgstr "Lag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148 msgid "Open a list of all loaded layers." msgstr "Liste over alle innleste lag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267 msgid "Delete the selected layers." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328 msgid "Show/Hide" msgstr "Vis/Skjul" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339 msgid "Toggle visible state of the selected layer." msgstr "Slå av/på visning av Lag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:434 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:536 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546 msgid "Move the selected layer one row up." msgstr "Flytt laget en rad opp." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:555 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565 msgid "Move the selected layer one row down." msgstr "Flytt laget en rad ned." @@ -5569,5 +5454,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173 -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3016 msgid "Relations" msgstr "Relasjoner" @@ -5595,5 +5480,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5636,30 +5521,30 @@ msgstr "Zoom til utvalg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Valgt: Rel.:{0} / Linjer:{1} / Noder:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:295 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Utvalg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343 #, java-format msgid "Selection: {0}" msgstr "Utvalg: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:357 msgid "Undock the panel" msgstr "Frigjør panelet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "Lukk panelet. Du kan åpne det med knappene i venstre verktøygruppe." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:372 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:382 msgid "Click to minimize/maximize the panel content" msgstr "Klikk for at minimere/maksimere panelet" @@ -5667,5 +5552,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:65 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:143 msgid "Authors" msgstr "Opphavsmenn" @@ -5675,5 +5560,5 @@ msgstr "Åbn en liste af brugere som jobber på de valgte objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:137 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 #, java-format msgid "{0} Author" @@ -5682,13 +5567,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:150 msgid "Select primitives submitted by this user" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:177 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 msgid "Launches a browser with information about the user" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:193 #, java-format msgid "" @@ -5696,5 +5581,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 #, java-format msgid "" @@ -5703,17 +5588,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:218 msgid "Missing encoding" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:268 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:281 msgid "Author" msgstr "Opphavsmann" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:281 msgid "# Objects" msgstr "# objekter" @@ -5789,5 +5674,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:518 msgid "" -"JOSM is currently running with an anonymous user. It can't " +"JOSM is currently running with an anonymous user. It cannot " "download
your changesets from the OSM server unless you enter your OSM " "user name
in the JOSM preferences." @@ -5800,10 +5685,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:62 -msgctxt "changeset.open" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:214 +msgctxt "changeset.state" msgid "Open" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64 -msgctxt "changeset.open" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:216 +msgctxt "changeset.state" msgid "Closed" msgstr "" @@ -5811,5 +5698,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:221 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:154 msgid "anonymous" msgstr "" @@ -5824,5 +5711,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53 msgid "User" msgstr "Bruker" @@ -5836,24 +5723,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:68 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:109 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:178 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:179 msgid "Downloading changeset content" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:96 -#, java-format -msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:170 #, java-format msgid "({0}/{1}) Downloading changeset {2}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:177 #, java-format msgid "({0}/{1}) Downloading content for changeset {2}..." @@ -5906,5 +5787,5 @@ #, java-format msgid "" -"The selected object isn''t available in the current
edit layer " +"The selected object is not available in the current
edit layer " "''{0}''." msgid_plural "" @@ -5981,4 +5862,7 @@ #. #. +#. item "Highways/Streets/Pedestrian" label "Edit Pedestrian Street" +#. +#. #. item "Highways/Streets/Road (Unknown Type)" label "Edit Road of unknown type" #. @@ -6004,81 +5888,41 @@ #. #. -#. item "Ways/Bridleway" label "Edit Bridleway" -#. -#. -#. -#. item "Ways/Cycleway" label "Edit Cycleway" -#. -#. -#. -#. item "Ways/Footway" label "Edit Footway" -#. -#. -#. -#. item "Ways/Pedestrian" label "Edit Pedestrian Street" -#. -#. -#. item "Ways/Steps" label "Edit Flight of Steps" -#. -#. -#. #. item "Ways/Track" label "Edit Track" #. #. #. -#. item "Ways/Track Grade 1" label "Edit Track of grade 1" -#. -#. -#. -#. -#. item "Ways/Track Grade 2" label "Edit Track of grade 2" -#. -#. -#. -#. -#. item "Ways/Track Grade 3" label "Edit Track of grade 3" -#. -#. -#. -#. -#. item "Ways/Track Grade 4" label "Edit Track of grade 4" -#. -#. -#. -#. -#. item "Ways/Track Grade 5" label "Edit Track of grade 5" -#. -#. -#. -#. -#. item "Ways/Hiking" label "Edit Hiking" +#. item "Ways/Path" label "Edit Path" #. #. -#. #. -#. item "Ways/Mountain Hiking" label "Edit Mountain Hiking" +#. item "Ways/Dedicated Bridleway" label "Edit Bridleway" +#. +#. +#. +#. item "Ways/Dedicated Cycleway" label "Edit Cycleway" +#. +#. +#. +#. item "Ways/Segregated Foot- and Cycleway" label "Edit Cycleway" #. #. -#. +#. +#. +#. #. -#. item "Ways/Demanding Mountain Hiking" label "Edit Demanding Mountain Hiking" +#. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway" #. #. -#. +#. +#. +#. #. -#. item "Ways/Alpine Hiking" label "Edit Alpine Hiking" +#. item "Ways/Dedicated Footway" label "Edit Footway" #. -#. -#. +#. #. -#. item "Ways/Demanding Alpine Hiking" label "Edit Demanding Alpine Hiking" +#. item "Ways/Steps" label "Edit Flight of Steps" #. -#. -#. -#. -#. item "Ways/Difficult Alpine Hiking" label "Edit Difficult Alpine Hiking" -#. -#. -#. +#. #. #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction" @@ -6697,5 +6541,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 @@ -6703,149 +6547,144 @@ #: build/trans_presets.java:211 build/trans_presets.java:229 #: build/trans_presets.java:246 build/trans_presets.java:264 -#: build/trans_presets.java:284 build/trans_presets.java:317 -#: build/trans_presets.java:363 build/trans_presets.java:383 -#: build/trans_presets.java:398 build/trans_presets.java:415 -#: build/trans_presets.java:435 build/trans_presets.java:455 -#: build/trans_presets.java:475 build/trans_presets.java:494 -#: build/trans_presets.java:514 build/trans_presets.java:534 -#: build/trans_presets.java:555 build/trans_presets.java:576 -#: build/trans_presets.java:597 build/trans_presets.java:618 -#: build/trans_presets.java:639 build/trans_presets.java:670 -#: build/trans_presets.java:691 build/trans_presets.java:704 -#: build/trans_presets.java:717 build/trans_presets.java:730 -#: build/trans_presets.java:743 build/trans_presets.java:756 -#: build/trans_presets.java:767 build/trans_presets.java:776 -#: build/trans_presets.java:823 build/trans_presets.java:844 -#: build/trans_presets.java:853 build/trans_presets.java:913 -#: build/trans_presets.java:1064 build/trans_presets.java:1072 -#: build/trans_presets.java:1080 build/trans_presets.java:1088 -#: build/trans_presets.java:1098 build/trans_presets.java:1106 -#: build/trans_presets.java:1111 build/trans_presets.java:1118 -#: build/trans_presets.java:1125 build/trans_presets.java:1130 -#: build/trans_presets.java:1138 build/trans_presets.java:1147 -#: build/trans_presets.java:1153 build/trans_presets.java:1159 -#: build/trans_presets.java:1164 build/trans_presets.java:1170 -#: build/trans_presets.java:1176 build/trans_presets.java:1185 -#: build/trans_presets.java:1194 build/trans_presets.java:1201 -#: build/trans_presets.java:1209 build/trans_presets.java:1222 -#: build/trans_presets.java:1228 build/trans_presets.java:1237 -#: build/trans_presets.java:1243 build/trans_presets.java:1249 -#: build/trans_presets.java:1257 build/trans_presets.java:1313 -#: build/trans_presets.java:1360 build/trans_presets.java:1366 -#: build/trans_presets.java:1372 build/trans_presets.java:1378 -#: build/trans_presets.java:1384 build/trans_presets.java:1395 -#: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1425 build/trans_presets.java:1433 -#: build/trans_presets.java:1440 build/trans_presets.java:1449 -#: build/trans_presets.java:1457 build/trans_presets.java:1468 -#: build/trans_presets.java:1478 build/trans_presets.java:1488 -#: build/trans_presets.java:1508 build/trans_presets.java:1520 -#: build/trans_presets.java:1531 build/trans_presets.java:1551 -#: build/trans_presets.java:1558 build/trans_presets.java:1574 -#: build/trans_presets.java:1581 build/trans_presets.java:1586 -#: build/trans_presets.java:1592 build/trans_presets.java:1598 -#: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1615 build/trans_presets.java:1623 -#: build/trans_presets.java:1631 build/trans_presets.java:1639 -#: build/trans_presets.java:1646 build/trans_presets.java:1652 -#: build/trans_presets.java:1659 build/trans_presets.java:1666 -#: build/trans_presets.java:1674 build/trans_presets.java:1681 -#: build/trans_presets.java:1689 build/trans_presets.java:1696 -#: build/trans_presets.java:1702 build/trans_presets.java:1709 -#: build/trans_presets.java:1716 build/trans_presets.java:1723 -#: build/trans_presets.java:1740 build/trans_presets.java:1748 -#: build/trans_presets.java:1763 build/trans_presets.java:1773 -#: build/trans_presets.java:1785 build/trans_presets.java:1792 -#: build/trans_presets.java:1798 build/trans_presets.java:1808 -#: build/trans_presets.java:1813 build/trans_presets.java:1821 -#: build/trans_presets.java:1828 build/trans_presets.java:1834 -#: build/trans_presets.java:1840 build/trans_presets.java:1846 -#: build/trans_presets.java:1851 build/trans_presets.java:1856 -#: build/trans_presets.java:1861 build/trans_presets.java:1868 -#: build/trans_presets.java:1874 build/trans_presets.java:1879 -#: build/trans_presets.java:1888 build/trans_presets.java:1897 -#: build/trans_presets.java:1906 build/trans_presets.java:1915 -#: build/trans_presets.java:1924 build/trans_presets.java:1930 -#: build/trans_presets.java:1938 build/trans_presets.java:1944 -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2029 -#: build/trans_presets.java:2038 build/trans_presets.java:2046 -#: build/trans_presets.java:2052 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2156 build/trans_presets.java:2162 -#: build/trans_presets.java:2168 build/trans_presets.java:2175 -#: build/trans_presets.java:2182 build/trans_presets.java:2190 -#: build/trans_presets.java:2197 build/trans_presets.java:2203 -#: build/trans_presets.java:2210 build/trans_presets.java:2216 -#: build/trans_presets.java:2222 build/trans_presets.java:2228 -#: build/trans_presets.java:2236 build/trans_presets.java:2243 -#: build/trans_presets.java:2250 build/trans_presets.java:2257 -#: build/trans_presets.java:2265 build/trans_presets.java:2297 -#: build/trans_presets.java:2302 build/trans_presets.java:2312 -#: build/trans_presets.java:2317 build/trans_presets.java:2323 -#: build/trans_presets.java:2329 build/trans_presets.java:2346 -#: build/trans_presets.java:2352 build/trans_presets.java:2358 -#: build/trans_presets.java:2364 build/trans_presets.java:2370 -#: build/trans_presets.java:2380 build/trans_presets.java:2387 -#: build/trans_presets.java:2482 build/trans_presets.java:2489 -#: build/trans_presets.java:2504 build/trans_presets.java:2512 -#: build/trans_presets.java:2517 build/trans_presets.java:2523 -#: build/trans_presets.java:2530 build/trans_presets.java:2537 -#: build/trans_presets.java:2543 build/trans_presets.java:2549 -#: build/trans_presets.java:2571 build/trans_presets.java:2578 -#: build/trans_presets.java:2585 build/trans_presets.java:2591 -#: build/trans_presets.java:2598 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2616 -#: build/trans_presets.java:2622 build/trans_presets.java:2628 -#: build/trans_presets.java:2635 build/trans_presets.java:2642 -#: build/trans_presets.java:2649 build/trans_presets.java:2655 -#: build/trans_presets.java:2661 build/trans_presets.java:2667 -#: build/trans_presets.java:2673 build/trans_presets.java:2679 -#: build/trans_presets.java:2686 build/trans_presets.java:2693 -#: build/trans_presets.java:2700 build/trans_presets.java:2706 -#: build/trans_presets.java:2712 build/trans_presets.java:2722 -#: build/trans_presets.java:2731 build/trans_presets.java:2746 -#: build/trans_presets.java:2752 build/trans_presets.java:2760 -#: build/trans_presets.java:2767 build/trans_presets.java:2787 -#: build/trans_presets.java:2798 build/trans_presets.java:2804 -#: build/trans_presets.java:2810 build/trans_presets.java:2816 -#: build/trans_presets.java:2822 build/trans_presets.java:2829 -#: build/trans_presets.java:2836 build/trans_presets.java:2843 -#: build/trans_presets.java:2849 build/trans_presets.java:2855 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2884 -#: build/trans_presets.java:2890 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2913 -#: build/trans_presets.java:2919 build/trans_presets.java:2925 -#: build/trans_presets.java:2931 build/trans_presets.java:2937 -#: build/trans_presets.java:2946 build/trans_presets.java:2956 -#: build/trans_presets.java:2965 build/trans_presets.java:2971 -#: build/trans_presets.java:2977 build/trans_presets.java:2982 -#: build/trans_presets.java:2988 build/trans_presets.java:2994 -#: build/trans_presets.java:3003 build/trans_presets.java:3009 -#: build/trans_presets.java:3015 build/trans_presets.java:3021 -#: build/trans_presets.java:3027 build/trans_presets.java:3033 -#: build/trans_presets.java:3039 build/trans_presets.java:3046 -#: build/trans_presets.java:3052 build/trans_presets.java:3057 -#: build/trans_presets.java:3064 build/trans_presets.java:3071 -#: build/trans_presets.java:3077 build/trans_presets.java:3086 -#: build/trans_presets.java:3094 build/trans_presets.java:3100 -#: build/trans_presets.java:3106 build/trans_presets.java:3113 -#: build/trans_presets.java:3119 build/trans_presets.java:3126 -#: build/trans_presets.java:3132 build/trans_presets.java:3138 -#: build/trans_presets.java:3144 build/trans_presets.java:3150 -#: build/trans_presets.java:3163 build/trans_presets.java:3177 -#: build/trans_presets.java:3191 +#: build/trans_presets.java:282 build/trans_presets.java:302 +#: build/trans_presets.java:335 build/trans_presets.java:381 +#: build/trans_presets.java:401 build/trans_presets.java:416 +#: build/trans_presets.java:433 build/trans_presets.java:453 +#: build/trans_presets.java:477 build/trans_presets.java:505 +#: build/trans_presets.java:525 build/trans_presets.java:548 +#: build/trans_presets.java:570 build/trans_presets.java:588 +#: build/trans_presets.java:609 build/trans_presets.java:628 +#: build/trans_presets.java:637 build/trans_presets.java:684 +#: build/trans_presets.java:705 build/trans_presets.java:714 +#: build/trans_presets.java:774 build/trans_presets.java:925 +#: build/trans_presets.java:933 build/trans_presets.java:941 +#: build/trans_presets.java:949 build/trans_presets.java:959 +#: build/trans_presets.java:967 build/trans_presets.java:972 +#: build/trans_presets.java:979 build/trans_presets.java:986 +#: build/trans_presets.java:991 build/trans_presets.java:999 +#: build/trans_presets.java:1008 build/trans_presets.java:1014 +#: build/trans_presets.java:1020 build/trans_presets.java:1025 +#: build/trans_presets.java:1031 build/trans_presets.java:1037 +#: build/trans_presets.java:1046 build/trans_presets.java:1055 +#: build/trans_presets.java:1062 build/trans_presets.java:1070 +#: build/trans_presets.java:1083 build/trans_presets.java:1089 +#: build/trans_presets.java:1098 build/trans_presets.java:1104 +#: build/trans_presets.java:1110 build/trans_presets.java:1118 +#: build/trans_presets.java:1174 build/trans_presets.java:1221 +#: build/trans_presets.java:1227 build/trans_presets.java:1233 +#: build/trans_presets.java:1239 build/trans_presets.java:1245 +#: build/trans_presets.java:1256 build/trans_presets.java:1265 +#: build/trans_presets.java:1280 build/trans_presets.java:1286 +#: build/trans_presets.java:1294 build/trans_presets.java:1301 +#: build/trans_presets.java:1310 build/trans_presets.java:1318 +#: build/trans_presets.java:1329 build/trans_presets.java:1339 +#: build/trans_presets.java:1349 build/trans_presets.java:1369 +#: build/trans_presets.java:1381 build/trans_presets.java:1392 +#: build/trans_presets.java:1412 build/trans_presets.java:1419 +#: build/trans_presets.java:1435 build/trans_presets.java:1442 +#: build/trans_presets.java:1447 build/trans_presets.java:1453 +#: build/trans_presets.java:1459 build/trans_presets.java:1464 +#: build/trans_presets.java:1470 build/trans_presets.java:1476 +#: build/trans_presets.java:1484 build/trans_presets.java:1492 +#: build/trans_presets.java:1500 build/trans_presets.java:1507 +#: build/trans_presets.java:1513 build/trans_presets.java:1520 +#: build/trans_presets.java:1527 build/trans_presets.java:1535 +#: build/trans_presets.java:1542 build/trans_presets.java:1550 +#: build/trans_presets.java:1557 build/trans_presets.java:1563 +#: build/trans_presets.java:1570 build/trans_presets.java:1577 +#: build/trans_presets.java:1584 build/trans_presets.java:1601 +#: build/trans_presets.java:1609 build/trans_presets.java:1624 +#: build/trans_presets.java:1634 build/trans_presets.java:1646 +#: build/trans_presets.java:1653 build/trans_presets.java:1659 +#: build/trans_presets.java:1669 build/trans_presets.java:1674 +#: build/trans_presets.java:1682 build/trans_presets.java:1689 +#: build/trans_presets.java:1695 build/trans_presets.java:1701 +#: build/trans_presets.java:1707 build/trans_presets.java:1712 +#: build/trans_presets.java:1717 build/trans_presets.java:1722 +#: build/trans_presets.java:1729 build/trans_presets.java:1735 +#: build/trans_presets.java:1740 build/trans_presets.java:1749 +#: build/trans_presets.java:1758 build/trans_presets.java:1767 +#: build/trans_presets.java:1776 build/trans_presets.java:1785 +#: build/trans_presets.java:1791 build/trans_presets.java:1799 +#: build/trans_presets.java:1805 build/trans_presets.java:1811 +#: build/trans_presets.java:1817 build/trans_presets.java:1823 +#: build/trans_presets.java:1829 build/trans_presets.java:1835 +#: build/trans_presets.java:1841 build/trans_presets.java:1847 +#: build/trans_presets.java:1853 build/trans_presets.java:1859 +#: build/trans_presets.java:1865 build/trans_presets.java:1871 +#: build/trans_presets.java:1877 build/trans_presets.java:1883 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1907 build/trans_presets.java:1913 +#: build/trans_presets.java:1919 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:1937 +#: build/trans_presets.java:1943 build/trans_presets.java:1949 +#: build/trans_presets.java:1955 build/trans_presets.java:1961 +#: build/trans_presets.java:1967 build/trans_presets.java:1973 +#: build/trans_presets.java:1979 build/trans_presets.java:1985 +#: build/trans_presets.java:1991 build/trans_presets.java:1997 +#: build/trans_presets.java:2003 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2029 +#: build/trans_presets.java:2036 build/trans_presets.java:2043 +#: build/trans_presets.java:2051 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2097 +#: build/trans_presets.java:2104 build/trans_presets.java:2111 +#: build/trans_presets.java:2118 build/trans_presets.java:2126 +#: build/trans_presets.java:2158 build/trans_presets.java:2163 +#: build/trans_presets.java:2173 build/trans_presets.java:2178 +#: build/trans_presets.java:2184 build/trans_presets.java:2190 +#: build/trans_presets.java:2207 build/trans_presets.java:2213 +#: build/trans_presets.java:2219 build/trans_presets.java:2225 +#: build/trans_presets.java:2231 build/trans_presets.java:2241 +#: build/trans_presets.java:2248 build/trans_presets.java:2343 +#: build/trans_presets.java:2350 build/trans_presets.java:2365 +#: build/trans_presets.java:2373 build/trans_presets.java:2378 +#: build/trans_presets.java:2384 build/trans_presets.java:2391 +#: build/trans_presets.java:2398 build/trans_presets.java:2404 +#: build/trans_presets.java:2410 build/trans_presets.java:2432 +#: build/trans_presets.java:2439 build/trans_presets.java:2446 +#: build/trans_presets.java:2452 build/trans_presets.java:2459 +#: build/trans_presets.java:2465 build/trans_presets.java:2471 +#: build/trans_presets.java:2477 build/trans_presets.java:2483 +#: build/trans_presets.java:2489 build/trans_presets.java:2496 +#: build/trans_presets.java:2503 build/trans_presets.java:2510 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2528 build/trans_presets.java:2534 +#: build/trans_presets.java:2540 build/trans_presets.java:2547 +#: build/trans_presets.java:2554 build/trans_presets.java:2561 +#: build/trans_presets.java:2567 build/trans_presets.java:2573 +#: build/trans_presets.java:2583 build/trans_presets.java:2592 +#: build/trans_presets.java:2607 build/trans_presets.java:2613 +#: build/trans_presets.java:2621 build/trans_presets.java:2628 +#: build/trans_presets.java:2648 build/trans_presets.java:2659 +#: build/trans_presets.java:2665 build/trans_presets.java:2671 +#: build/trans_presets.java:2677 build/trans_presets.java:2683 +#: build/trans_presets.java:2690 build/trans_presets.java:2697 +#: build/trans_presets.java:2704 build/trans_presets.java:2710 +#: build/trans_presets.java:2716 build/trans_presets.java:2724 +#: build/trans_presets.java:2731 build/trans_presets.java:2738 +#: build/trans_presets.java:2745 build/trans_presets.java:2751 +#: build/trans_presets.java:2758 build/trans_presets.java:2765 +#: build/trans_presets.java:2774 build/trans_presets.java:2780 +#: build/trans_presets.java:2786 build/trans_presets.java:2792 +#: build/trans_presets.java:2798 build/trans_presets.java:2807 +#: build/trans_presets.java:2817 build/trans_presets.java:2826 +#: build/trans_presets.java:2832 build/trans_presets.java:2838 +#: build/trans_presets.java:2843 build/trans_presets.java:2849 +#: build/trans_presets.java:2855 build/trans_presets.java:2864 +#: build/trans_presets.java:2870 build/trans_presets.java:2876 +#: build/trans_presets.java:2882 build/trans_presets.java:2888 +#: build/trans_presets.java:2894 build/trans_presets.java:2900 +#: build/trans_presets.java:2907 build/trans_presets.java:2913 +#: build/trans_presets.java:2918 build/trans_presets.java:2925 +#: build/trans_presets.java:2932 build/trans_presets.java:2938 +#: build/trans_presets.java:2947 build/trans_presets.java:2955 +#: build/trans_presets.java:2961 build/trans_presets.java:2967 +#: build/trans_presets.java:2974 build/trans_presets.java:2980 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:2999 build/trans_presets.java:3005 +#: build/trans_presets.java:3011 build/trans_presets.java:3024 +#: build/trans_presets.java:3038 build/trans_presets.java:3052 msgid "Name" msgstr "Navn" @@ -6873,14 +6712,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:180 msgid "Closed on:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:214 -msgctxt "changeset.state" -msgid "Open" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:216 -msgctxt "changeset.state" -msgid "Closed" msgstr "" @@ -6947,5 +6776,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141 msgid "" -"The current value isn't a valid changeset ID. Please enter an integer value " +"The current value is not a valid changeset ID. Please enter an integer value " "> 0" msgstr "" @@ -7007,5 +6836,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527 msgid "" -"Can't restrict changeset query to the current user because the current user " +"Cannot restrict changeset query to the current user because the current user " "is anonymous" msgstr "" @@ -7013,10 +6842,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533 #, java-format -msgid "Current value ''{0}'' for user ID isn''t valid" +msgid "Current value ''{0}'' for user ID is not valid" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536 #, java-format -msgid "Can''t restrict the changeset query to the user name ''{0}''" +msgid "Cannot restrict the changeset query to the user name ''{0}''" msgstr "" @@ -7064,5 +6893,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837 msgid "" -"Can't build changeset query with time based restrictions. Input isn't valid." +"Cannot build changeset query with time based restrictions. Input is not " +"valid." msgstr "" @@ -7079,5 +6909,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942 msgid "" -"Can't restrict the changeset query to a specific bounding box. The input is " +"Cannot restrict the changeset query to a specific bounding box. The input is " "invalid." msgstr "" @@ -7096,10 +6926,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993 msgid "" -"The current value isn't a valid user ID. Please enter an integer value > 0" +"The current value is not a valid user ID. Please enter an integer value > 0" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030 msgid "" -"The current value isn't a valid user name.
Please enter an non-" +"The current value is not a valid user name.
Please enter an non-" "empty user name." msgstr "" @@ -7112,6 +6942,6 @@ #, java-format msgid "" -"Please enter a date in the usual format for your locale.
Example: " -"{0}
Example: {1}
Example: {2}
Example: {3}
" +"Please enter a date in the usual format for your locale.
Example: {0}" +"
Example: {1}
Example: {2}
Example: {3}
" msgstr "" @@ -7141,5 +6971,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51 -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:174 msgid "Basic" msgstr "Enkel" @@ -7222,5 +7052,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181 #, java-format msgid "This will change {0} object." @@ -7229,22 +7059,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:183 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:363 msgid "Change values?" msgstr "Endre verdier?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:296 #, java-format msgid "Change properties of up to {0} object" @@ -7253,5 +7083,5 @@ msgstr[1] "Endre egenskap på inntil {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336 #, java-format msgid "This will change up to {0} object." @@ -7260,110 +7090,110 @@ msgstr[1] "Dette vil endre opptil {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:338 msgid "Please select a key" msgstr "Velg en nøkkel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351 msgid "Please select a value" msgstr "Velg en verdi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:435 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:437 msgid "Please select the objects you want to change properties for." msgstr "Velg de objekter, du vil rette egenskaper for." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:441 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444 msgid "Properties/Memberships" msgstr "Egenskaper/medlemsskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 msgid "Properties for selected objects." msgstr "Egenskaper for valgte objekt." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:477 msgid "Member Of" msgstr "Medlem av" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:566 msgid "Add Properties" msgstr "Tilføy egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Egenskaper: {0} / Medlemskap: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811 msgid "Properties / Memberships" msgstr "Egenskaper / Medlemskap" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864 msgid "Change relation" msgstr "Skift relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 msgid "Delete from relation" msgstr "Slett fra relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Vil du slette utvalget fra relasjon {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888 msgid "Delete the selected key in all objects" msgstr "Fjern den valgte nøkkel i alle objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890 msgid "Delete Properties" msgstr "DSlett egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921 msgid "Add a new key/value pair to all objects" msgstr "Tilføy et nytt nøkkel/verdi-sett til alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933 msgid "Edit the value of the selected key for all objects" msgstr "Rett verdien for den valgte nøkkel for alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969 msgid "Select relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970 msgid "Select relation in main selection." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972 msgid "Select in relation list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973 msgid "Select relation in relation list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178 msgid "Edit the relation the currently selected relation member refers to." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221 msgid "Download all child relations (recursively)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223 msgid "Download All Children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242 msgid "Download selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246 msgid "Download Selected Children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:290 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:446 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:449 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:40 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:47 @@ -7371,30 +7201,33 @@ msgstr "Last ned medlemer av relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 -msgid "Conflicts in data" -msgstr "Konflikter i data" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:342 -#, java-format -msgid "" -"The child relation
{0}
is deleted on the server. It can't be " +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1093 +msgid "Conflict in data" +msgid_plural "Conflicts in data" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It cannot be " "loaded" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:354 msgid "Relation is deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:517 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:411 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:522 #, java-format msgid "Downloading relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:427 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:430 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:532 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:110 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:110 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" @@ -7408,63 +7241,63 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 msgid "Download relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 #, java-format msgid "({0}/{1}): Downloading relation ''{2}''..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is " -"discouraged.
How do you want to proceed with circular dependencies?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578 +"relation itself.
This creates circular dependencies and is discouraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:601 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 #, java-format msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation " -"member?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611 +"primitive ''{0}''

Do you really want to add another relation member?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 #, java-format msgid "" @@ -7474,15 +7307,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:670 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:696 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:723 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7490,5 +7323,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:757 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7496,20 +7329,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:789 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:792 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:826 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 #, java-format msgid "" @@ -7518,162 +7351,165 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:860 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 msgid "Sort" msgstr "Sorter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Move the currently selected members up" msgstr "Flytt valgte medlem opp" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 msgid "Move the currently selected members down" msgstr "Flytt valgt medlem ned" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:983 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1074 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 -msgid "" -"This relation has been changed outside of the editor.
You can't " +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +msgid "" +"This relation has been changed outside of the editor.
You cannot " "apply your changes and continue editing.

Do you want to create a " "conflict and close the editor?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 -msgid "Conflict in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for " -"primitive
''{1}''.
Please resolve this conflict first, then try " -"again." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1204 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 msgid "Download Members" msgstr "Last ned medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1291 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 -#, java-format -msgid "" -"You are setting an empty role on {0} primitives.
This is equal to " -"deleting the roles of these primitives.
Do you really want to apply the " -"new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 +#, java-format +msgid "You are setting an empty role on {0} primitive." +msgid_plural "You are setting an empty role on {0} primitives." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#, fuzzy +msgid "Do you really want to apply the new role?" +msgstr "Vil du tillate dette?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1315 +msgid "No, do not apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1384 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1389 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -7700,14 +7536,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 msgid "Download referring relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81 -#, java-format -msgid "Value of child.getId() > 0 expected. Got {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:187 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "Det oppstod {0} konflikter under import." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:195 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -7730,5 +7566,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 msgid "Apply Changes" msgstr "Utfør endringer" @@ -7754,7 +7590,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 -msgid "" -"Warning: ignoring exception because task was cancelled. Exception was: " -msgstr "" +#, fuzzy, java-format +msgid "" +"Warning: ignoring exception because task was cancelled. Exception was: {0}" +msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72 @@ -7852,7 +7689,7 @@ #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200 -#, java-format -msgid "The string ''{0}'' isn''t a valid double value." -msgstr "" +#, fuzzy, java-format +msgid "The string ''{0}'' is not a valid double value." +msgstr "parameter «{0}» er ikke et gyldig typenavn – leste «{1}»" #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 @@ -7934,7 +7771,6 @@ #, java-format msgid "" -"Neither {0} nor {1} is " -"enabled.
Please chose to either download OSM data, or GPX data, or " -"both." +"Neither {0} nor {1} is enabled." +"
Please chose to either download OSM data, or GPX data, or both." msgstr "" @@ -7997,8 +7833,4 @@ #. #. -#. item "Ways/Path" label "Edit Path" -#. -#. -#. #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing" #. @@ -8013,45 +7845,38 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431 -#: build/trans_presets.java:361 build/trans_presets.java:660 -#: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2337 -#: build/trans_presets.java:2379 build/trans_presets.java:2405 -#: build/trans_presets.java:2947 build/trans_presets.java:2957 -#: build/trans_presets.java:2966 +#: build/trans_presets.java:379 build/trans_presets.java:661 +#: build/trans_presets.java:1009 build/trans_presets.java:1267 +#: build/trans_presets.java:2198 build/trans_presets.java:2240 +#: build/trans_presets.java:2266 build/trans_presets.java:2808 +#: build/trans_presets.java:2818 build/trans_presets.java:2827 msgid "Type" msgstr "Type" -#. item "Ways/Cycleway" combo "Pedestrians" -#. item "Ways/Footway" combo "Bikes" +#. item "Ways/Path" combo "Wheelchairs" +#. item "Ways/Dedicated Cycleway" combo "Pedestrians" +#. item "Ways/Dedicated Footway" combo "Bikes" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:92 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:45 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:56 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:58 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:139 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 -#: build/trans_presets.java:335 build/trans_presets.java:336 -#: build/trans_presets.java:337 build/trans_presets.java:338 -#: build/trans_presets.java:339 build/trans_presets.java:340 -#: build/trans_presets.java:341 build/trans_presets.java:342 -#: build/trans_presets.java:343 build/trans_presets.java:344 -#: build/trans_presets.java:345 build/trans_presets.java:461 -#: build/trans_presets.java:481 build/trans_presets.java:541 -#: build/trans_presets.java:542 build/trans_presets.java:543 -#: build/trans_presets.java:562 build/trans_presets.java:563 -#: build/trans_presets.java:564 build/trans_presets.java:583 -#: build/trans_presets.java:584 build/trans_presets.java:585 -#: build/trans_presets.java:604 build/trans_presets.java:605 -#: build/trans_presets.java:606 build/trans_presets.java:625 -#: build/trans_presets.java:626 build/trans_presets.java:627 -#: build/trans_presets.java:646 build/trans_presets.java:647 -#: build/trans_presets.java:648 build/trans_presets.java:785 -#: build/trans_presets.java:800 build/trans_presets.java:1344 -#: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2473 -#: build/trans_presets.java:2474 build/trans_presets.java:2475 +#: build/trans_presets.java:353 build/trans_presets.java:354 +#: build/trans_presets.java:355 build/trans_presets.java:356 +#: build/trans_presets.java:357 build/trans_presets.java:358 +#: build/trans_presets.java:359 build/trans_presets.java:360 +#: build/trans_presets.java:361 build/trans_presets.java:362 +#: build/trans_presets.java:363 build/trans_presets.java:464 +#: build/trans_presets.java:465 build/trans_presets.java:466 +#: build/trans_presets.java:489 build/trans_presets.java:531 +#: build/trans_presets.java:594 build/trans_presets.java:646 +#: build/trans_presets.java:661 build/trans_presets.java:1205 +#: build/trans_presets.java:1272 build/trans_presets.java:1273 +#: build/trans_presets.java:1274 build/trans_presets.java:2334 +#: build/trans_presets.java:2335 build/trans_presets.java:2336 msgid "unknown" msgstr "ukjent" @@ -8106,6 +7931,6 @@ "english.

Please help to improve the JOSM help system and fill in the " "missing information.You can both edit the help topic in your " -"local language ({1}) and the help topic in " -"english.

" +"local language ({1}) and the help topic in english." msgstr "" @@ -8115,6 +7940,6 @@ "

Error when retrieving help information

The content for the help topic {0} " -"could not be loaded. The error message is " -"(untranslated):
{1}

" +"could not be loaded. The error message is (untranslated):
{1}" msgstr "" @@ -8168,5 +7993,6 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 -msgid "Warning: bad location in HTML document. Exception was: " +#, java-format +msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" @@ -8210,11 +8036,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274 msgid "History not initialized yet. Failed to set reference primitive." -msgstr "" -"Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement." - -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 +msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement." + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 #, java-format msgid "" @@ -8222,5 +8047,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:279 #, java-format msgid "" @@ -8230,10 +8055,9 @@ "historikken." +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +msgid "History not initialized yet. Failed to set current primitive." +msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element." + #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 -msgid "History not initialized yet. Failed to set current primitive." -msgstr "" -"Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element." - -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -8244,35 +8068,20 @@ "tilgjengelig i historikken." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:54 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:66 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:55 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 msgid "Load history" msgstr "Last historikk" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:80 -#, java-format -msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:98 -#, java-format -msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:143 -#, java-format -msgid "Object id > 0 expected. Got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:195 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:186 #, java-format msgid "Loading history for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:196 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:187 #, java-format msgid "Loading history for way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:188 #, java-format msgid "Loading history for relation {0}" @@ -8312,9 +8121,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:55 msgid "Changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91 #, java-format msgid "" @@ -8322,5 +8131,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97 #, java-format msgid "" @@ -8378,5 +8187,5 @@ #, java-format msgid "" -"Failed to update primitive with id {0} because current edit layer doesn't " +"Failed to update primitive with id {0} because current edit layer does not " "include such a primitive" msgstr "" @@ -8408,9 +8217,8 @@ "version of one
of your nodes, ways, or relations.
The conflict is " "caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click " -"{4} to synchronize the conflicting primitive only.
Click " -"{5} to synchronize the entire local dataset with the " -"server.
Click {6} to abort and continue " -"editing.
" +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" msgstr "" "Upplasting feilet fordi tjeneren har en nyere versjon " @@ -8419,6 +8227,6 @@ "{2}, lokal versjon er {3}.

Trykk {4} for å " "synkronisere kun konfliktelementet.
Trykk {5} for å " -"synkronisere hele det lokale datasettet med tjeneren.
Trykk " -"{6} for å gå tilbake og fortsette å redigere.
" +"synkronisere hele det lokale datasettet med tjeneren.
Trykk {6} for å gå tilbake og fortsette å redigere.
" #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 @@ -8432,19 +8240,17 @@ msgid "" "Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click " -"{0} to synchronize the entire local dataset with the " -"server.
Click {1} to abort and continue " -"editing.
" +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" msgstr "" "Opplasting feilet fordi tjeneren har en nyere versjon " "av en node, linje ellerrelasjon.

Trykk {0} for å " -"synkronisere hele det lokale datasettet med tjeneren.
Trykk " -"{1} for å avbryte operasjonen og fortsette å " -"redigere.
" +"synkronisere hele det lokale datasettet med tjeneren.
Trykk {1} for å avbryte operasjonen og fortsette å redigere.
" #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 #, java-format msgid "" -"Uploading failed because you''ve been " +"Uploading failed because you have been " "using
changeset {0} which was already closed at {1}.
Please upload " "again with a new or an existing open changeset." @@ -8608,6 +8414,6 @@ #, java-format msgid "" -"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " -"username and a valid password." +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid username " +"and a valid password." msgstr "" @@ -8627,12 +8433,12 @@ #, java-format msgid "" -"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " -"username and a valid password." +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 msgid "" -"Warning: depending on the authentication method the proxy server uses " -"the password may be transferred unencrypted." +"Warning: depending on the authentication method the proxy server uses the " +"password may be transferred unencrypted." msgstr "" @@ -8651,15 +8457,15 @@ #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:63 msgid "" -"Could not retrieve the list of your open changesets because
JOSM " -"doesn't know your identity.
You've either chosen to work anonymously or " -"you are not entitled
to know the identity of the user on whose behalf you " -"are working." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:69 +"Could not retrieve the list of your open changesets because
JOSM does not " +"know your identity.
You have either chosen to work anonymously or you are " +"not entitled
to know the identity of the user on whose behalf you are " +"working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:68 msgid "Missing user identity" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:122 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:121 #, java-format msgid "" @@ -8689,6 +8495,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format -msgid "" -"Layer ''{0}'' has modifications which should be uploaded to the server." +msgid "Layer ''{0}'' has modifications which should be uploaded to the server." msgstr "" @@ -8773,6 +8578,6 @@ msgid_plural "" "{0} layers need saving but have no associated file.
Either select a " -"file for each of them or discard the changes.
Layers without a " -"file:" +"file for each of them or discard the changes.
Layers without a file:" msgstr[0] "" msgstr[1] "" @@ -8785,9 +8590,9 @@ #, java-format msgid "" -"{0} layer needs saving but has an associated file
which can't be " -"written.
Either select another file for this layer or discard the " -"changes.
Layer with a non-writable file:" +"{0} layer needs saving but has an associated file
which cannot be " +"written.
Either select another file for this layer or discard the changes." +"
Layer with a non-writable file:" msgid_plural "" -"{0} layers need saving but have associated files
which can't be " +"{0} layers need saving but have associated files
which cannot be " "written.
Either select another file for each of them or discard the " "changes.
Layers with non-writable files:" @@ -8841,8 +8646,13 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 +#, java-format msgid "" "An upload and/or save operation of one layer with modifications
was " "cancelled or has failed." -msgstr "" +msgid_plural "" +"Upload and/or save operations of {0} layers with modifications
were " +"cancelled or have failed." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 @@ -8868,4 +8678,5 @@ #. item "Highways/Streets/Residential" check "Embankment" #. item "Highways/Streets/Living Street" check "Embankment" +#. item "Highways/Streets/Pedestrian" check "Embankment" #. item "Highways/Streets/Service" check "Embankment" #. item "Highways/Streets/Road (Unknown Type)" check "Embankment" @@ -8874,8 +8685,8 @@ #. item "Highways/Streets/Tunnel" text "Name" #. item "Ways/Construction" check "Embankment" -#. item "Ways/Bridleway" check "Embankment" -#. item "Ways/Pedestrian" check "Embankment" +#. item "Ways/Dedicated Bridleway" check "Embankment" +#. item "Ways/Segregated Foot- and Cycleway" check "Embankment" +#. item "Ways/Combined Foot- and Cycleway" check "Embankment" #. item "Ways/Steps" check "Embankment" -#. item "Ways/Path" check "Embankment" #. item "Water/Water/Drain" text "Name" #. item "Water/Water/Stream" text "Name" @@ -8889,16 +8700,15 @@ #: build/trans_presets.java:192 build/trans_presets.java:212 #: build/trans_presets.java:235 build/trans_presets.java:253 -#: build/trans_presets.java:271 build/trans_presets.java:290 -#: build/trans_presets.java:323 build/trans_presets.java:369 -#: build/trans_presets.java:384 build/trans_presets.java:399 -#: build/trans_presets.java:421 build/trans_presets.java:441 -#: build/trans_presets.java:462 build/trans_presets.java:482 -#: build/trans_presets.java:501 build/trans_presets.java:520 -#: build/trans_presets.java:540 build/trans_presets.java:561 -#: build/trans_presets.java:582 build/trans_presets.java:603 -#: build/trans_presets.java:624 build/trans_presets.java:645 -#: build/trans_presets.java:676 build/trans_presets.java:1073 -#: build/trans_presets.java:1081 build/trans_presets.java:1089 -#: build/trans_presets.java:1099 build/trans_presets.java:1319 +#: build/trans_presets.java:271 build/trans_presets.java:289 +#: build/trans_presets.java:308 build/trans_presets.java:341 +#: build/trans_presets.java:387 build/trans_presets.java:402 +#: build/trans_presets.java:417 build/trans_presets.java:439 +#: build/trans_presets.java:463 build/trans_presets.java:493 +#: build/trans_presets.java:511 build/trans_presets.java:532 +#: build/trans_presets.java:554 build/trans_presets.java:576 +#: build/trans_presets.java:595 build/trans_presets.java:615 +#: build/trans_presets.java:934 build/trans_presets.java:942 +#: build/trans_presets.java:950 build/trans_presets.java:960 +#: build/trans_presets.java:1180 msgid "Layer" msgstr "Lag" @@ -9002,6 +8812,6 @@ #. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 #, java-format msgid "" @@ -9010,5 +8820,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 msgid "Preparing primitives to upload ..." msgstr "" @@ -9026,6 +8836,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 -msgid "" -"The changeset is going to be closed after this upload" +msgid "The changeset is going to be closed after this upload" msgstr "" @@ -9080,6 +8889,6 @@ #, java-format msgid "" -"Uploading {0} objects to multiple " -"changesets using {1} requests" +"Uploading {0} objects to multiple changesets using {1} requests" msgstr "" @@ -9133,7 +8942,7 @@ msgid "" "Click ''{0}'' to continue uploading to additional new " -"changsets.
Click ''{1}'' to return to the upload " -"dialog.
Click ''{2}'' to abort uploading and return to " -"map editing.
" +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" msgstr "" @@ -9143,5 +8952,5 @@ #. we tried to delete an already deleted primitive. -#. +#. #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 #, java-format @@ -9161,8 +8970,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 -#, java-format -msgid "" -"Ignoring caught exception because upload is canceled. Exception is: {0}" +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" msgstr "" @@ -9231,5 +9039,5 @@ #, java-format msgid "" -"Can''t upload {0} objects in one request because the
max. changeset " +"Cannot upload {0} objects in one request because the
max. changeset " "size {1} on server ''{2}'' is exceeded." msgstr "" @@ -9315,5 +9123,4 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "gps-punkt" @@ -9380,11 +9187,11 @@ #, java-format msgid "" -"The data in the GPX layer ''{0}'' has been downloaded from the " -"server.
Because its way points don''t include a timestamp we can''t " -"correlate them with audio data." +"The data in the GPX layer ''{0}'' has been downloaded from the server." +"
Because its way points do not include a timestamp we cannot correlate " +"them with audio data." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:313 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311 msgid "Import not possible" msgstr "" @@ -9399,17 +9206,17 @@ msgstr "Lyd-markører fra {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 msgid "Import images" msgstr "Importer bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 -#, java-format -msgid "" -"The data in the GPX layer ''{0}'' has been downloaded from the " -"server.
Because its way points don''t include a timestamp we can''t " -"correlate them with images." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304 +#, java-format +msgid "" +"The data in the GPX layer ''{0}'' has been downloaded from the server." +"
Because its way points do not include a timestamp we cannot correlate " +"them with images." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189 #, java-format @@ -9417,5 +9224,5 @@ msgstr "Navn: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:374 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format @@ -9423,5 +9230,5 @@ msgstr "Beskrivelse: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377 #, java-format msgid "{0} track" @@ -9431,23 +9238,23 @@ #. item "Relations/Route" text "Symbol description" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3055 msgid "Description" msgstr "Beskrivelse" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379 msgid "Timespan" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380 msgid "Length" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:433 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441 msgid "Length: " msgstr "Lengde: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:436 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444 #, java-format msgid "{0} route, " @@ -9456,5 +9263,5 @@ msgstr[1] "{0} ruter, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:437 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445 #, java-format msgid "{0} waypoint" @@ -9463,23 +9270,23 @@ msgstr[1] "{0} waypoints" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Konverter til datalag" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788 -msgid "" -"Upload of unprocessed GPS data as map data is considered " -"harmful.
If you want to upload traces, look here:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796 +msgid "" +"Upload of unprocessed GPS data as map data is considered harmful." +"
If you want to upload traces, look here:" msgstr "" "Opplasting av ubehandlede GPS-data som kortdata betraktes som " "skadeligt
Se her for å laste inn GPS spor:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 @@ -9490,29 +9297,29 @@ msgstr "Konvertert fra: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:959 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965 msgid "Download from OSM along this track" msgstr "Last ned fra OSM langs dette spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851 msgid "Download everything within:" msgstr "Last ned alt innenfor:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 #, java-format msgid "{0} meters" msgstr "{0} meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858 msgid "Maximum area per request:" msgstr "Max areal per forespørsel:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:952 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957 #, java-format msgid "" @@ -9523,9 +9330,9 @@ "Ønsker du
å fortsette?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1063 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069 msgid "No GPX track available in layer to associate audio with." msgstr "Ingen GPX-spor er tilgængelige i laget som kan assosieres med lyd." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1232 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -9535,5 +9342,5 @@ "ble utelatt eller flyttet til start." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -9637,6 +9444,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" -"Upload of unprocessed GPS data as map data is considered " -"harmful.
If you want to upload traces, look here:" +"Upload of unprocessed GPS data as map data is considered harmful." +"
If you want to upload traces, look here:" msgstr "" @@ -9675,4 +9482,9 @@ msgstr[1] "{0} punkt" +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#, fuzzy +msgid "GPS point" +msgstr "GPS-punkter" + #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145 msgid "GPX Files (*.gpx *.gpx.gz)" @@ -9696,10 +9508,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" -"Take a photo of your GPS receiver while it displays the " -"time.
Display that photo here.
And then, simply capture the time you " -"read on the photo and select a timezone
" -msgstr "" -"Ta et bilde av din GPS mottaker når den viser tid.
Vis bildet " -"her.
Skriv inn tidspunktet og velg tidssone
" +"Take a photo of your GPS receiver while it displays the time." +"
Display that photo here.
And then, simply capture the time you read " +"on the photo and select a timezone
" +msgstr "" +"Ta et bilde av din GPS mottaker når den viser tid.
Vis bildet her." +"
Skriv inn tidspunktet og velg tidssone
" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 @@ -9716,5 +9528,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 -msgid "I'm in the timezone of: " +msgid "I am in the timezone of: " msgstr "Jeg er i tidssonen: " @@ -9725,5 +9537,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 -msgid "Open an other photo" +msgid "Open another photo" msgstr "Åpne et annet foto" @@ -9801,48 +9613,51 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 #, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712 +msgid "Matched {0} of {1} photo to GPX track." +msgid_plural "" +"Matched {0} of {1} photos to GPX track." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714 msgid "Correlate images with GPX track" msgstr "Jevnfør bilder med GPX spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:670 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672 msgid "Correlate" msgstr "Jevnfør" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:697 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699 msgid "Invalid timezone" msgstr "Ugyldig tidssone" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707 msgid "Invalid offset" msgstr "Ugyldig forskyvning" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:713 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715 msgid "Try Again" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716 msgid "No images could be matched!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865 #, java-format msgid "Timezone: {0}" msgstr "Tidssone: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866 #, java-format msgid "Minutes: {0}" msgstr "Minutter: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 #, java-format msgid "Seconds: {0}" msgstr "Sekunder: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:883 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 #, java-format msgid "(Time difference of {0} day)" @@ -9851,5 +9666,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -9859,38 +9674,39 @@ "synkronisere bildene manuelt." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914 msgid "Matching photos to track failed" msgstr "Klarte ikke å koble foto til sporet" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:928 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930 msgid "Adjust timezone and offset" msgstr "Juster tidssone og forskyvning" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948 -msgid "The selected photos don't contain time information." +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950 +msgid "The selected photos do not contain time information." msgstr "Valgte foto har ikke tidskode." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949 -msgid "Photos don't contain time information" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951 +msgid "Photos do not contain time information" msgstr "Foto har ikke tidskode." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:977 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979 +msgid "" +"The selected GPX track does not contain timestamps. Please select another " +"one." msgstr "Valgte GPX spor mangler tidskode. Velg et annet spor." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:978 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980 msgid "GPX Track has no time information" msgstr "GPX sporet har ikke tidskoder" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075 msgid "You should select a GPX track" msgstr "Du bør velge et GPX-spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076 msgid "No selected GPX track" msgstr "Intgen GPX-spor er valgt" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1247 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249 #, java-format msgid "" @@ -9901,5 +9717,5 @@ "Forventet format: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319 #, java-format msgid "" @@ -9962,13 +9778,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320 -msgid "image" -msgid_plural "images" -msgstr[0] "bilde" -msgstr[1] "bilder" +#, fuzzy, java-format +msgid "{0} image loaded." +msgid_plural "{0} images loaded." +msgstr[0] "Ingen data lastet inn." +msgstr[1] "Ingen data lastet inn." #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "{0} hadde gps posisjon." +#, fuzzy, java-format +msgid "{0} was found to be GPS tagged." +msgid_plural "{0} were found to be GPS tagged." +msgstr[0] "{0} hadde gps posisjon." +msgstr[1] "{0} hadde gps posisjon." #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585 @@ -10177,5 +9996,5 @@ #, java-format msgid "" -"Warning: failed to load Mappaint-Styles from ''{0}''. Exception was: {1}" +"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}" msgstr "" @@ -10183,9 +10002,9 @@ #, java-format msgid "" -"Warning: failed to parse Mappaint-Styles from ''{0}''. Exception was: {1}" +"Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37 -#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70 +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:68 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233 msgid "Access Token Key:" @@ -10193,5 +10012,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49 -#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84 +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:82 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245 msgid "Access Token Secret:" @@ -10229,5 +10048,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 msgid "Authorise URL:" msgstr "" @@ -10251,25 +10070,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58 +#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:58 msgid "Fully automatic" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61 +#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:61 msgid "Semi-automatic" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64 +#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:64 msgid "Manual" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73 +#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:73 msgid "" "Run a fully automatic procedure to get an access token from the OSM " "website.
JOSM accesses the OSM website on behalf of the JOSM user and " -"fully
automatically authorises the user and retrieves an Access " -"Token." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80 +"fully
automatically authorises the user and retrieves an Access Token." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:80 msgid "" "Run a semi-automatic procedure to get an access token from the OSM " @@ -10280,5 +10099,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88 +#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:88 msgid "" "Enter an Access Token manually if it was generated and retrieved " @@ -10286,56 +10105,61 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:112 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40 msgid "Username: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:127 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54 msgid "Password: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:175 msgid "Granted rights" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:176 msgid "Advanced OAuth properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236 -#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:236 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:357 msgid "Accept Access Token" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237 -#, java-format -msgid "" -"You''ve sucessfully retrieved an OAuth Access Token from the OSM " +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:237 +#, java-format +msgid "" +"You have sucessfully retrieved an OAuth Access Token from the OSM " "website. Click on {0} to accept the token. JOSM will use it " "in subsequent requests to gain access to the OSM API." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 msgid "Authorise now" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 msgid "Click to redirect you to the authorisation form on the JOSM web site" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:365 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:274 +msgid "Back" +msgstr "Tilbake" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 msgid "Run the automatic authorisation steps again" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380 -#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233 -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:380 +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:231 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:436 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355 msgid "Test Access Token" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:409 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24 @@ -10343,24 +10167,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:411 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26 -msgid "The user name can't be empty. Please enter your OSM user name" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430 +msgid "The user name cannot be empty. Please enter your OSM user name" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:430 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73 msgid "Please enter your OSM password" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432 -msgid "The password can't be empty. Please enter your OSM password" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:432 +msgid "The password cannot be empty. Please enter your OSM password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 msgid "Authorise JOSM to access the OSM API" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:456 msgid "" "The automatic process for retrieving an OAuth Access Token
from the " @@ -10369,28 +10193,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463 -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480 -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:463 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 msgid "OAuth authorisation failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 +#, java-format msgid "" "The automatic process for retrieving an OAuth Access Token
from the " -"OSM server failed because JOSM wasn't able to build
a valid login URL " +"OSM server failed because JOSM was not able to build
a valid login URL " "from the OAuth Authorise Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:496 #, java-format msgid "" "The automatic process for retrieving an OAuth Access Token
from the " -"OSM server failed. JOSM failed to log into {0}
for user " -"{1}.

Please check username and password and try again." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57 -#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141 +"OSM server failed. JOSM failed to log into {0}
for user {1}." +"

Please check username and password and try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58 +#, java-format +msgid "" +"Please enter an OAuth Access Token which is authorised to access the OSM " +"server ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97 +msgid "Save Access Token to preferences" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:118 +msgid "Access Token" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:119 +msgid "Advanced OAuth parameters" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:121 +msgid "Enter the OAuth Access Token" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:122 +msgid "Enter advanced OAuth properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:139 #, java-format msgid "" @@ -10399,38 +10250,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99 -msgid "Save Access Token to preferences" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120 -msgid "Access Token" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121 -msgid "Advanced OAuth parameters" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123 -msgid "Enter the OAuth Access Token" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124 -msgid "Enter advanced OAuth properties" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179 +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:177 msgid "Please enter an Access Token Key" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181 +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:179 msgid "" "The Access Token Key must not be empty. Please enter an Access Token Key" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199 +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:197 msgid "Please enter an Access Token Secret" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201 +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:199 msgid "" "The Access Token Secret must not be empty. Please enter an Access Token " @@ -10438,78 +10269,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235 -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438 +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:233 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:438 msgid "Click to test the Access Token" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 msgid "Please select an authorisation procedure: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 #, java-format msgid "Get an Access Token for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 msgid "Close the dialog and cancel authorisation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 msgid "Close the dialog and accept the Access Token" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99 -#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102 -#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:99 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:102 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:105 msgid "Warning: failed to cancel running OAuth operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:129 #, java-format msgid "Retrieving OAuth Request Token from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:162 #, java-format msgid "Retrieving OAuth Access Token from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299 -#, java-format -msgid "OSM website didn''t reply a session cookie in response to ''{0}''," -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350 -#, java-format -msgid "" -"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:299 +#, java-format +msgid "OSM website did not return a session cookie in response to ''{0}''," +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:350 +#, java-format +msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format msgid "Failed to authorise OAuth request ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:486 msgid "Initializing a session at the OSM website..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:492 #, java-format msgid "Authenticating the session for user ''{0}''..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format msgid "Authorising request token ''{0}''..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:504 #, java-format msgid "Logging out session ''{0}''..." @@ -10581,15 +10411,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:130 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82 msgid "Display Advanced OAuth Parameters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166 -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:166 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:369 msgid "Retrieve Request Token" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:163 #, java-format msgid "" @@ -10598,57 +10428,57 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:182 msgid "Step 1/3: Retrieve an OAuth Request Token" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 msgid "Step 2/3: Authorise and retrieve an Access Token" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:228 msgid "Request Access Token" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220 -#, java-format -msgid "" -"JOSM successfully retrieved a Request Token. JOSM is now " -"launching an authorisation page in an external browser. Please login with " -"your OSM username and password and follow the instructions to authorise the " -"Request Token. Then switch back to this dialog and click on " -"{0}

If launching the external browser fails you can " -"copy the following authorise URL and paste it into the address field of your " -"browser." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275 -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:220 +#, java-format +msgid "" +"JOSM successfully retrieved a Request Token. JOSM is now launching an " +"authorisation page in an external browser. Please login with your OSM " +"username and password and follow the instructions to authorise the Request " +"Token. Then switch back to this dialog and click on {0}

If launching the external browser fails you can copy the " +"following authorise URL and paste it into the address field of your browser." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:275 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:349 msgid "Go back to step 1/3" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:292 msgid "Step 3/3: Successfully retrieved an Access Token" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306 -msgid "" -"JOSM has successfully retrieved an Access Token. You can now " -"accept this token. JOSM will used it the future for authentication and " -"authorisation at the OSM server.

The access token is: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:306 +msgid "" +"JOSM has successfully retrieved an Access Token. You can now accept " +"this token. JOSM will use it in the future for authentication and " +"authorisation to the OSM server.

The access token is: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:348 msgid "Restart" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:371 msgid "Click to retrieve a Request Token" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:402 msgid "Retrieve Access Token" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:404 msgid "Click to retrieve an Access Token" msgstr "" @@ -10665,5 +10495,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120 #, java-format -msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded." +msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden." msgstr "" @@ -10672,5 +10502,5 @@ msgid "" "Successfully used the Access Token ''{0}'' to
access the OSM server " -"at ''{1}''.
You''re accessing the OSM server as user ''{2}'' with id " +"at ''{1}''.
You are accessing the OSM server as user ''{2}'' with id " "''{3}''." msgstr "" @@ -10699,9 +10529,9 @@ #, java-format msgid "" -"The AccessToken ''{1}'' is known to the OSM server ''{0}''.
The " -"test to retrieve the user details for this token failed, " -"though.
Depending on what rights are granted to this token you may " -"nevertheless use it
to upload data, upload GPS traces, and/or access " -"other protected resources." +"The Access Token ''{1}'' is known to the OSM server ''{0}''.
The " +"test to retrieve the user details for this token failed, though." +"
Depending on what rights are granted to this token you may nevertheless " +"use it
to upload data, upload GPS traces, and/or access other protected " +"resources." msgstr "" @@ -10713,5 +10543,5 @@ #, java-format msgid "" -"Failed to retrieve information about the current userfrom the OSM " +"Failed to retrieve information about the current user from the OSM " "server ''{0}''.
This is probably not a problem caused by the tested " "Access Token, but
rather a problem with the server configuration. " @@ -10728,7 +10558,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235 msgid "" -"The test failed because the server responded with an internal " -"error.
JOSM couldn''t decide whether the token is valid. Please try again " -"later." +"The test failed because the server responded with an internal error." +"
JOSM could not decide whether the token is valid. Please try again later." +"" msgstr "" @@ -10768,5 +10598,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "Please select the row to edit." msgstr "Velg raden som skal endres" @@ -10780,5 +10610,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -11000,5 +10830,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49 -#: build/trans_presets.java:1388 +#: build/trans_presets.java:1249 msgid "Car" msgstr "Bil" @@ -11020,17 +10850,16 @@ #. item "Public Transport/Subway Entrance" check "Wheelchair" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49 -#: build/trans_presets.java:336 build/trans_presets.java:662 -#: build/trans_presets.java:869 build/trans_presets.java:888 -#: build/trans_presets.java:902 build/trans_presets.java:924 -#: build/trans_presets.java:961 build/trans_presets.java:974 -#: build/trans_presets.java:986 build/trans_presets.java:998 -#: build/trans_presets.java:1010 build/trans_presets.java:1022 -#: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1444 -#: build/trans_presets.java:1510 +#: build/trans_presets.java:354 build/trans_presets.java:487 +#: build/trans_presets.java:730 build/trans_presets.java:749 +#: build/trans_presets.java:763 build/trans_presets.java:785 +#: build/trans_presets.java:822 build/trans_presets.java:835 +#: build/trans_presets.java:847 build/trans_presets.java:859 +#: build/trans_presets.java:871 build/trans_presets.java:883 +#: build/trans_presets.java:893 build/trans_presets.java:902 +#: build/trans_presets.java:911 build/trans_presets.java:1305 +#: build/trans_presets.java:1371 msgid "Bicycle" msgstr "Sykkel" -#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -11060,12 +10889,12 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49 -#: build/trans_presets.java:337 build/trans_presets.java:661 -#: build/trans_presets.java:868 build/trans_presets.java:887 -#: build/trans_presets.java:901 build/trans_presets.java:923 -#: build/trans_presets.java:960 build/trans_presets.java:973 -#: build/trans_presets.java:985 build/trans_presets.java:997 -#: build/trans_presets.java:1009 build/trans_presets.java:1021 -#: build/trans_presets.java:1031 build/trans_presets.java:1040 -#: build/trans_presets.java:1049 +#: build/trans_presets.java:355 build/trans_presets.java:486 +#: build/trans_presets.java:729 build/trans_presets.java:748 +#: build/trans_presets.java:762 build/trans_presets.java:784 +#: build/trans_presets.java:821 build/trans_presets.java:834 +#: build/trans_presets.java:846 build/trans_presets.java:858 +#: build/trans_presets.java:870 build/trans_presets.java:882 +#: build/trans_presets.java:892 build/trans_presets.java:901 +#: build/trans_presets.java:910 msgid "Foot" msgstr "Til fots" @@ -11118,8 +10947,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "" -"Maximum length (in meters) to draw lines for local files. Set to '-1' to " +"Maximum length (in meters) to draw lines for local files. Set to ''-1'' to " "draw all lines." msgstr "" -"Max lengde (i meter) for å tegne linjer i lokal fil. '-1' tegner alle linjer." +"Max lengde (i meter) for å tegne linjer i lokal fil. ''-1'' tegner alle " +"linjer." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106 @@ -11129,8 +10959,8 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111 msgid "" -"Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." -msgstr "" -"Maksimal lengde (i meter) for å tegne linjer. Sett til '-1' for å tegne alle " -"linjer." +"Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines." +msgstr "" +"Maksimal lengde (i meter) for å tegne linjer. Sett til ''-1'' for å tegne " +"alle linjer." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113 @@ -11151,6 +10981,5 @@ #. drawGpsArrowsFast #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135 -msgid "" -"Draw the direction arrows using table lookups instead of complex math." +msgid "Draw the direction arrows using table lookups instead of complex math." msgstr "" "Tegn retningspiler ved hjelp av tabellopslag i stedet for kompleks matematik." @@ -11159,8 +10988,7 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141 msgid "" -"Don't draw arrows if they are not at least this distance away from the last " +"Do not draw arrows if they are not at least this distance away from the last " "one." -msgstr "" -"Tegn ikke piler uten at det er minst denne avstand fra forrige punkt." +msgstr "Tegn ikke piler uten at det er minst denne avstand fra forrige punkt." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144 @@ -11215,6 +11043,5 @@ #. antialiasing #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242 -msgid "" -"Apply antialiasing to the map view resulting in a smoother appearance." +msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Bruk udjevning på kartvisningen for et mere glatt utseende." @@ -11302,13 +11129,12 @@ msgstr "Map Pain stiler" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 -#, java-format -msgid "" -"The following plugin has been downloaded successfully:" +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:68 +#, java-format +msgid "The following plugin has been downloaded successfully:" msgid_plural "The following {0} plugins have been downloaded successfully:" msgstr[0] "" msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 #, java-format msgid "Downloading the following plugin has failed:" @@ -11318,64 +11144,65 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:108 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Search:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:119 msgid "Enter a search expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:166 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:172 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:184 msgid "Add JOSM Plugin description URL." msgstr "Legg til URL for liste over programtillegg." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:185 msgid "Enter URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:215 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:221 msgid "Please select an entry." msgstr "Velg en verdi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:206 msgid "Edit JOSM Plugin description URL." msgstr "Rediger URL for liste over programtillegg." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:201 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:207 msgid "JOSM Plugin description URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:234 msgid "Configure Plugin Sites" msgstr "Indstilling på programtillegg sider" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:280 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:296 msgid "Download list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:281 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:297 msgid "Download the list of available plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:310 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:328 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:340 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:180 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:540 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:326 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:344 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:745 msgid "Update plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:311 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:327 msgid "Update the selected plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:363 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:379 msgid "Configure sites..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:364 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:380 msgid "Configure the list of sites where plugins are downloaded from" msgstr "" @@ -11406,6 +11233,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes " -"here.

" +"This is another reason to restart JOSM after making any changes here." +"

" msgstr "" "

Dessuten: Første gang en menyknapp kobles til menyen blir hurtigtasten " @@ -11415,13 +11242,14 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170 +#, fuzzy msgid "" "

You may notice that the key selection list on the next page lists all " "keys that exist on all kinds of keyboards Java knows about, not just those " "keys that exist on your keyboard. Please use only those values that " -"correspond to a real key on your keyboard. So if your keyboard has no 'Copy' " -"key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " -"there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key " -"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"correspond to a real key on your keyboard. So if your keyboard has no " +"''Copy'' key (PC keyboard do not have them, Sun keyboards do), the do not " +"use it. Also there will be ''keys'' listed that correspond to a shortcut on " +"your keyboard (e.g. '':''/Colon). Please also do not use them, use the base " +"key ('';''/Semicolon on US keyboards, ''.''/Period on German keyboards, ...) " "instead. Not doing so may result in conflicts, as there is no way for JOSM " "to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " @@ -11462,7 +11290,7 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183 msgid "" -"

The pseudo-modifier 'disabled' will disable the shortcut when " +"

The pseudo-modifier ''disabled'' will disable the shortcut when " "encountered.

" -msgstr "

Pseudo-kombinasjonstasten 'disabled' vil ta ut snarveien.

" +msgstr "

Pseudo-kombinasjonstasten ''disabled'' vil ta ut snarveien.

" #. scroll up @@ -11736,6 +11564,6 @@ #, java-format msgid "" -"Failed to load the list of style sources " -"from
''{0}''.

Details (untranslated):
{1}" +"Failed to load the list of style sources from
''{0}''." +"

Details (untranslated):
{1}" msgstr "" @@ -11798,5 +11626,5 @@ #, java-format msgid "" -"''{0}'' isn't a valid OSM API URL.
Please check the spelling and " +"''{0}'' is not a valid OSM API URL.
Please check the spelling and " "validate again." msgstr "" @@ -11810,6 +11638,6 @@ #, java-format msgid "" -"Failed to build URL ''{0}'' for validating the OSM API " -"server.
Please check the spelling of ''{1}'' and validate again." +"Failed to build URL ''{0}'' for validating the OSM API server." +"
Please check the spelling of ''{1}'' and validate again." msgstr "" @@ -11831,6 +11659,6 @@ msgid "" "Failed to retrieve a list of changesets from the OSM API server " -"at
''{1}''. The server responded with the return code {0} instead of " -"200.
Please check the spelling of ''{1}'' and validate again." +"at
''{1}''. The server responded with the return code {0} instead of 200." +"
Please check the spelling of ''{1}'' and validate again." msgstr "" @@ -11838,6 +11666,6 @@ #, java-format msgid "" -"The OSM API server at ''{0}'' didn''t return a valid response.
It " -"is likely that ''{0}'' isn''t an OSM API server.
Please check the " +"The OSM API server at ''{0}'' did not return a valid response.
It " +"is likely that ''{0}'' is not an OSM API server.
Please check the " "spelling of ''{0}'' and validate again." msgstr "" @@ -11908,6 +11736,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150 -msgid "" -"Warning: Failed to retrieve OAuth Access Token from credential manager" +msgid "Warning: Failed to retrieve OAuth Access Token from credential manager" msgstr "" @@ -11918,11 +11745,10 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186 msgid "" -"You don't have an Access Token yet to access the OSM server using OAuth. " +"You do not have an Access Token yet to access the OSM server using OAuth. " "Please authorise first." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225 -msgid "" -"You already have an Access Token to access the OSM server using OAuth." +msgid "You already have an Access Token to access the OSM server using OAuth." msgstr "" @@ -11979,5 +11805,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:239 -msgid "The current value isn't a valid URL" +msgid "The current value is not a valid URL" msgstr "" @@ -12016,6 +11842,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:244 msgid "" -"Use standard system settings (disabled. Start JOSM with -" -"Djava.net.useSystemProxies=true to enable)" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" msgstr "" @@ -12031,5 +11857,5 @@ msgid "" "Warning: JOSM is configured to use proxies from the system setting, but the " -"JVM is not configured to retrieve them. Resetting preferences to 'No proxy'" +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" msgstr "" @@ -12156,6 +11982,6 @@ #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:60 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." @@ -12169,11 +11995,14 @@ #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 -msgid "" -"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " -"capabilities. Got ''{2}" -msgstr "" +#, fuzzy, java-format +msgid "" +"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}''" +msgstr "" +"ugyldig verdi for obligatorisk attributt «{0}» av type «OsmPrimitiveType» – " +"leste «{1}»" #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163 #, java-format msgid "Failed to parse date ''{0}'' replied by server." @@ -12187,38 +12016,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:126 -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:128 -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:132 +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:127 +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:129 +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:133 #, java-format msgid "Illegal longitude value for parameter ''{0}'', got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:130 +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:131 #, java-format msgid "Illegal latitude value for parameter ''{0}'', got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:293 -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:298 -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:300 -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:307 -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:313 -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:318 -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:324 -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:329 -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:340 -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:347 +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:294 +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:299 +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:301 +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:308 +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:314 +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:319 +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:325 +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:330 +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:341 +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:348 #, java-format msgid "Unexpected value for ''{0}'' in changeset query url, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:361 -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:365 -msgid "" -"Can't create a changeset query including both the query parameters 'uid' and " -"'display_name'" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:390 +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:362 +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:366 +msgid "" +"Cannot create a changeset query including both the query parameters ''uid'' " +"and ''display_name''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:391 #, java-format msgid "Unsupported parameter ''{0}'' in changeset query string" @@ -12272,5 +12101,5 @@ #. Just log something. The network stack will also throw an exception which will be caught #. somewhere else -#. +#. #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:143 #, java-format @@ -12282,6 +12111,6 @@ msgid "" "Warning: the JVM is not configured to lookup proxies from the system " -"settings. The property 'java.net.useSystemProxies' was missing at startup " -"time. Won't use a proxy." +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Will not use a proxy." msgstr "" @@ -12300,24 +12129,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:38 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:40 #, java-format msgid "Could not import ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:48 msgid "Could not import files." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:59 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:62 #, java-format msgid "Could not read file ''{0}''.
Error is:
{1}" msgstr "Kunne ikke lese fil ''{0}''.
Feilen er:
{1}" -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:73 +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:76 #, java-format msgid "Could not read files.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:39 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:41 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -12327,6 +12156,6 @@ "spor." -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:42 -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:25 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:26 msgid "GPX Files" msgstr "GPX filer" @@ -12385,8 +12214,8 @@ msgstr "Velg en lisens" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 -#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:86 -#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:83 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 +#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87 +#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129 #, java-format @@ -12394,5 +12223,5 @@ msgstr "Markører fra {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:67 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68 #, java-format msgid "" @@ -12401,10 +12230,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 #, java-format msgid "File \"{0}\" does not exist" msgstr "Fila «{0}» finnes ikke" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82 #, java-format msgid "Parsing file \"{0}\" failed" @@ -12420,13 +12249,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:20 +#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23 msgid "Image Files" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:20 +#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23 msgid "folder" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:39 +#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38 +#, fuzzy +msgid "Looking for image files" +msgstr "Søker etter kystlinje …" + +#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48 msgid "No image files found." msgstr "" @@ -12438,7 +12272,6 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#, java-format -msgid "" -"No primitive with id {0} in local dataset. Can't infer primitive type." +#, fuzzy, java-format +msgid "No primitive with id {0} in local dataset. Cannot infer primitive type." msgstr "" "Lokalt datasett har ikke noe element med ID {0}. Elementtype er ukjent." @@ -12447,5 +12280,5 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:82 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 @@ -12503,47 +12336,47 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "NMEA-0183 filer" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 -#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:111 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113 msgid "Coordinates imported: " msgstr "Importerte koordinater: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Ugyldig koding: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Feil i kontrollsum: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Ukjent koding: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Koodinater med null: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "NMEA data er lest inn" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import failure!" msgstr "Feil ved import av NMEA data!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:85 #, java-format msgid "Preference ''{0}'' missing. Cannot initialize OsmApi." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 msgid "This version of JOSM is incompatible with the configured server." msgstr "Denne versjonen av JOSM kan ikke lese fra tjeneren." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:165 #, java-format msgid "" @@ -12552,10 +12385,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:169 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Kommunikasjon er opprettet med {0} med protocol versjon {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:255 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:256 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format @@ -12563,5 +12396,5 @@ msgstr "Uventet ID-format i svar fra tjener – leste «{0}»" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:276 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:277 #, java-format msgid "" @@ -12578,67 +12411,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:661 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 +msgid "Updating changeset..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#, java-format +msgid "Updating changeset {0}..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:662 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 -msgid "Updating changeset..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#, java-format -msgid "Updating changeset {0}..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Lukker endringssett …" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "Ingen base med rettinger tilstede for opplasting" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 msgid "Preparing upload request..." msgstr "" -#. Upload to the server -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425 -#, java-format -msgid "Uploading {0} objects..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424 +#, fuzzy, java-format +msgid "Uploading {0} object..." +msgid_plural "Uploading {0} objects..." +msgstr[0] "Endre {0} objekt" +msgstr[1] "Endre {0} objekt" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:456 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:538 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:537 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:633 msgid "Current changeset is null. Cannot upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:636 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:635 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:664 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:663 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -12657,10 +12490,10 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:17 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 msgid "OSM Server Files bzip2 compressed" msgstr "OSM-tjenerfiler bzip2-komprimert" -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:26 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:30 msgid "Invalid bz2 file." msgstr "Ugyldig bzip2-fil" @@ -12680,12 +12513,12 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:120 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:135 -#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109 -#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:73 +#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:69 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:196 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -12727,6 +12560,5 @@ "Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''." msgstr "" -"ugyldig verdi for obligatorisk attributt «{0}» av type «boolean» – leste " -"«{1}»" +"ugyldig verdi for obligatorisk attributt «{0}» av type «boolean» – leste «{1}»" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:150 @@ -12755,5 +12587,5 @@ msgid "" "Illegal document structure. Found node, way, or relation outside of " -"'create', 'modify', or 'delete'." +"''create'', ''modify'', or ''delete''." msgstr "" @@ -12769,61 +12601,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78 -#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128 -#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144 -#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:79 +#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:135 +#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:145 +#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:151 #, java-format msgid "Illegal value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:82 #, java-format msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:116 #, java-format msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 +#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:160 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 +#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199 #, java-format msgid "Unsupported version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:177 #, java-format msgid "Undefined element ''{0}'' found in input stream. Aborting." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 -#, java-format -msgid "Illegal value for attribute ''uid''. Got ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:216 +#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:217 msgid "Parsing list of changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120 -msgid "" -"Failed to add an OAuth authentication header. There is currently no OAuth " -"Access Token configured." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:125 msgid "Failed to sign a HTTP connection with an OAuth Authentication header" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:136 #, java-format msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''." @@ -12836,27 +12656,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 msgid "OSM Server Files" msgstr "OSM-tjenerfiler" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 -#, java-format -msgid "Expected instance of OsmDataLayer. Got ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 -#, java-format -msgid "" -"An error occurred while restoring backup file.
Error " -"is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -12864,5 +12679,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:16 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 msgid "OSM Server Files gzip compressed" msgstr "OSM-tjenerfiler gzip-komprimert" @@ -12872,10 +12687,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 #, java-format msgid "File ''{0}'' does not exist." msgstr "Fila «{0}» finnes ikke" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:112 #, java-format msgid "" @@ -12884,46 +12699,45 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 -#, java-format -msgid "" -"Missing manadatory attributes on element ''bounds''. Got " -"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223 +#, java-format +msgid "" +"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:280 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 -#, java-format -msgid "" -"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:285 +#, java-format +msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:289 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:292 #, java-format msgid "" @@ -12931,19 +12745,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:299 msgid "Incomplete specification with ref=0" msgstr "Ufullstendig -spesifikasjon med ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 msgid "Illegal object with ID=0." msgstr "Ulovlig objekt med id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 #, java-format msgid "" @@ -12953,8 +12767,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:371 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393 #, java-format msgid "" @@ -12964,10 +12778,10 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:384 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:390 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." @@ -12975,6 +12789,6 @@ #. for a new primitive we just log a warning -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:430 #, java-format msgid "" @@ -12984,21 +12798,21 @@ #. for an existing primitive this is a problem -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:434 #, java-format msgid "Illegal value for attribute ''changeset''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:443 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:448 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:470 #, java-format msgid "" @@ -13006,5 +12820,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488 #, java-format msgid "" @@ -13013,5 +12827,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:534 #, java-format msgid "" @@ -13019,5 +12833,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:546 #, java-format msgid "" @@ -13026,52 +12840,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Prepare OSM data..." msgstr "Klargjør OSM-data …" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:594 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:599 msgid "Preparing data set..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:55 -#, java-format -msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134 msgid "Downloading from OSM Server..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:142 msgid "Downloading referring ways ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:180 msgid "Downloading referring relations ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:60 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:65 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:66 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:94 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:100 #, java-format msgid "Downloading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:129 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:130 #, java-format msgid "Downloading {0} changeset ..." @@ -13080,25 +12889,15 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:144 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:145 #, java-format msgid "({0}/{1}) Downloading changeset {2} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:173 -#, java-format -msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:185 #, java-format msgid "Downloading content for changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 -#, java-format -msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''." -msgstr "parameter «{0}» >= 0 forventet – leste «{1}»" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:68 msgid "Downloading history..." msgstr "Laster ned historikk …" @@ -13108,10 +12907,4 @@ msgstr "Kobler til tjener …" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 -#, java-format -msgid "Expected value > 0 for parameter ''{0}'', got {1}" -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 #, java-format @@ -13121,5 +12914,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" -"Couldn't connect to the OSM server. Please check your internet connection." +"Could not connect to the OSM server. Please check your internet connection." msgstr "" "Kunne ikke koble til OSM-tjeneren. Kontroller internett-tilkoblingen din." @@ -13149,42 +12942,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79 msgid "Starting to upload with one request per primitive ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:87 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:86 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:119 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:121 msgid "Starting to upload in one request ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:139 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 #, java-format msgid "Value >0 expected for parameter ''{0}'', got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:143 msgid "Starting to upload in chunks..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:156 -#, java-format -msgid "({0}/{1}) Uploading {2} objects..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:182 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 +#, java-format +msgid "({0}/{1}) Uploading {2} object..." +msgid_plural "({0}/{1}) Uploading {2} objects..." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186 msgid "Uploading data ..." msgstr "" @@ -13214,5 +13009,5 @@ #, java-format msgid "" -"Warning: Cannot download plugin ''{0}''. Its download link isn''t known. " +"Warning: Cannot download plugin ''{0}''. Its download link is not known. " "Skipping download." msgstr "" @@ -13221,5 +13016,5 @@ #, java-format msgid "" -"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' isn''t a " +"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a " "valid URL. Skipping download." msgstr "" @@ -13241,5 +13036,5 @@ msgstr "Det oppsto feil i programtillegget {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108 msgid "The following plugin is no longer necessary and has been deactivated:" msgid_plural "" @@ -13248,65 +13043,78 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:133 -#, java-format -msgid "" -"Loading of {0} plugin was requested.
This plugin is no longer " -"developed and very likely will produce errors.
It should be " +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140 +#, java-format +msgid "" +"Loading of the plugin \"{0}\" was requested.
This plugin is no " +"longer developed and very likely will produce errors.
It should be " "disabled.
Delete from preferences?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 -msgid "" -"You updated your JOSM software.
To prevent problems the plugins " -"should be updated as well.

Update plugins now?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:170 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167 +msgid "" +"You updated your JOSM software.
To prevent problems the plugins should be " +"updated as well.

Update plugins now?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:183 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Siste oppdaterte programtillegg for {0} dager siden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194 +msgid "Click to update the activated plugins" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "Skip update" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:202 -#, java-format -msgid "" -"A required plugin for plugin {0} was not found. The required plugin is:" +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +msgid "Click to skip updating the activated plugins" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238 +#, fuzzy, java-format +msgid "" +"Plugin {0} requires a plugin which was not found. The missing plugin is:" msgid_plural "" -"{1} required plugins for plugin {0} were not found. The required plugins are:" +"Plugin {0} requires {1} plugins which were not found. The missing plugins " +"are:" msgstr[0] "" +"Programtillegget {1} er avhengig av programtillegg {0} men ble ikke funnet." msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238 -#, java-format -msgid "Plugin {0} requires JOSM update to version {1}." -msgstr "Programtillegg {0} krever JOSM-oppdatering til versjon {1}." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +"Programtillegget {1} er avhengig av programtillegg {0} men ble ikke funnet." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260 +#, java-format +msgid "" +"Plugin {0} requires JOSM version {1}. The current JOSM version is {2}." +"
You have to update JOSM in order to use this plugin." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 #, java-format msgid "loading plugin ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:354 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Kan ikke laste inn programtillegg {0}. slettes fra innstillinger?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:330 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:373 msgid "Loading plugins ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:345 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:374 msgid "Checking plugin preconditions..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:358 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:401 #, java-format msgid "Loading plugin ''{0}''..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:482 msgid "JOSM could not find information about the following plugin:" msgid_plural "JOSM could not find information about the following plugins:" @@ -13314,5 +13122,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:447 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:490 msgid "The plugin is not going to be loaded." msgid_plural "The plugins are not going to be loaded." @@ -13320,17 +13128,17 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:472 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:516 msgid "Determine plugins to load..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:478 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:522 msgid "Removing deprecated plugins..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:480 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:524 msgid "Removing umaintained plugins..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:504 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:548 msgid "Updating the following plugin has failed:" msgid_plural "Updating the following plugins has failed:" @@ -13338,32 +13146,47 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:514 -msgid "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:559 +msgid "" +"Please open the Preference Dialog after JOSM has started and try to update " +"it manually." +msgid_plural "" "Please open the Preference Dialog after JOSM has started and try to update " "them manually." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:519 +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567 msgid "Plugin update failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:574 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:576 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:688 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:689 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:623 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:638 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716 msgid "Disable plugin" msgstr "Fjern programtillegg" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:576 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625 +#, java-format +msgid "Click to delete the plugin ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722 msgid "Keep plugin" msgstr "Behold programtillegg" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:637 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:631 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:724 +#, java-format +msgid "Click to keep the plugin ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:700 #, java-format msgid "Warning: failed to delete outdated plugin ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:638 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:701 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707 #, java-format msgid "" @@ -13372,5 +13195,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:643 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:706 #, java-format msgid "" @@ -13379,21 +13202,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:693 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:694 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718 +#, java-format +msgid "Click to disable the plugin ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:731 #, java-format msgid "" "An unexpected exception occurred that may have come from the ''{0}'' plugin." -msgstr "" -"Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:697 +msgstr "Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:734 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "I følge nformasjon i tilleggsprogram, er {0} opphavsmann." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:700 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:737 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -13401,9 +13224,9 @@ "Prøv å oppdatere til ny versjon av programtillegg før du sender feilmelding." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:702 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:739 msgid "Should the plugin be disabled?" msgstr "Skal programtillegget fjernes?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:714 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -13413,21 +13236,21 @@ "lese programtillegg." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:720 -msgid "The plugin could not be removed. Probably it was already disabled" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:766 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:853 msgid "Plugin information" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:771 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:858 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:179 msgid "no description available" msgstr "ingen beskrivelse tilgjengelig" +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890 +msgid "Do not check and ask again at startup (remembers choice)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69 -#, java-format -msgid "The plugin file ''{0}'' doesn't include a Manifest." -msgstr "" +#, fuzzy, java-format +msgid "The plugin file ''{0}'' does not include a Manifest." +msgstr "Fila «{0}» finnes ikke" #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:181 @@ -13459,6 +13282,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:119 #, java-format -msgid "" -"Warning: Failed to scan file ''{0}'' for plugin information. Skipping." +msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping." msgstr "" @@ -13514,18 +13336,20 @@ msgstr "Feil med avspilling av lyd" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:56 +#. Then ask for submitting a bug report, for exceptions thrown from a plugin too +#. +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 msgid "Do nothing" msgstr "Ikke gjør noe" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:56 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 msgid "Report Bug" msgstr "Rapporter feil" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 -msgid "" -"An unexpected exception occurred.\n" -"\n" -"This is always a coding error. If you are running the latest\n" -"version of JOSM, please consider being kind and file a bug report." +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64 +#, fuzzy +msgid "" +"An unexpected exception occurred.
This is always a coding error. If you " +"are running the latest
version of JOSM, please consider being kind and " +"file a bug report." msgstr "" "En uventet unntakstilstand opstod.\n" @@ -13534,9 +13358,9 @@ "versjon av JOSM, setter vi pris på en feilrapport." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "Unexpected Exception" msgstr "En uventet unntakstilstand" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:103 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:117 msgid "" "You have encountered an error in JOSM. Before you file a bug reportmake sure " @@ -13544,5 +13368,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:107 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:121 msgid "" "You should also update your plugins. If neither of those help pleasefile a " @@ -13550,5 +13374,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:111 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:125 msgid "" "There the error information provided below should already befilled in for " @@ -13557,34 +13381,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:115 -msgid "" -"Alternatively, if that doesn't work you can manually fill in the " +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129 +msgid "" +"Alternatively, if that does not work you can manually fill in the " "informationbelow at this URL:" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:122 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:136 msgid "(The text has already been copied to your clipboard.)" msgstr "(Teksten har alt blitt kopiert til utklippstavlen din.)" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:151 msgid "You have encountered a bug in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:22 -#, java-format -msgid "Expected unique id > 0 for primitive id, got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:27 -#, java-format -msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:47 -#, java-format -msgid "Parameter ''{0}'' of type node expected, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:41 #, java-format msgid "" @@ -13593,5 +13402,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 +#, java-format +msgid "" +"Failed to authenticate at the OSM server ''{0}''.
You are using " +"OAuth to authenticate but currently there is no
OAuth Access Token " +"configured.
Please open the Preferences Dialog and generate or enter an " +"Access Token." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:77 #, java-format msgid "" @@ -13601,40 +13419,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:104 #, java-format msgid "" "Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message " -"is:
{0}" +"current
dataset violates a precondition.
The error message is:
{0}" msgstr "" "Opplasting til tjeneren feilet fordi nåværende " "datasett
bryter en forhåndsbetingelse.
Feilmelding:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 -#, java-format -msgid "" -"Authentication at the OSM server with the username ''{0}'' " -"failed.
Please check the username and the password in the JOSM " -"preferences." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102 -#, java-format -msgid "" -"Authentication at the OSM server with the OAuth token ''{0}'' " -"failed.
Please launch the preferences dialog and retrieve another OAuth " -"token." -msgstr "" - #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112 #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' " -"failed.
The token is not authorised to access the protected " -"resource
''{1}''.
Please launch the preferences dialog and retrieve " -"another OAuth token." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148 +"Authentication at the OSM server with the username ''{0}'' failed." +"
Please check the username and the password in the JOSM preferences." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:122 +#, java-format +msgid "" +"Authentication at the OSM server with the OAuth token ''{0}'' failed." +"
Please launch the preferences dialog and retrieve another OAuth token." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:132 +#, java-format +msgid "" +"Authorisation at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorised to access the protected resource
''{1}''." +"
Please launch the preferences dialog and retrieve another OAuth token." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168 #, java-format msgid "" @@ -13643,5 +13461,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:174 #, java-format msgid "" @@ -13650,5 +13468,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:183 #, java-format msgid "" @@ -13657,9 +13475,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:189 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204 #, java-format msgid "" @@ -13668,13 +13486,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:244 #, java-format msgid "" "Failed to open a connection to the remote server
''{0}''
for " "security reasons. This is most likely because you are running
in an " -"applet and because you didn''t load your applet from ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 +"applet and because you did not load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "" @@ -13683,5 +13501,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:277 #, java-format msgid "" @@ -13690,53 +13508,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273 -#, java-format -msgid "" -"The OSM server
''{0}''
reported an internal server " -"error.
This is most likely a temporary problem. Please try again " -"later." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293 +#, java-format +msgid "" +"The OSM server
''{0}''
reported an internal server error." +"
This is most likely a temporary problem. Please try again later." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290 -msgid "" -"The area you tried to download is too big or your request was too " -"large.
Either request a smaller area or use an export file provided by " -"the OSM community." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:310 +msgid "" +"The area you tried to download is too big or your request was too large." +"
Either request a smaller area or use an export file provided by the OSM " +"community." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307 -#, java-format -msgid "" -"The OSM server ''{0}'' doesn''t know about an object
you tried to read, " -"update, or delete. Either the respective object
doesn''t exist on the " -"server or you''re using an invalid URL to access
it. Please carefully " -"check the servers address ''{0}'' for typos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327 +#, java-format +msgid "" +"The OSM server ''{0}'' does not know about an object
you tried to read, " +"update, or delete. Either the respective object
does not exist on the " +"server or you are using an invalid URL to access
it. Please carefully " +"check the server''s address ''{0}'' for typos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:354 #, java-format msgid "" "Failed to open a connection to the remote server
''{0}''.
Host " -"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"name ''{1}'' could not be resolved.
Please check the API URL in your " "preferences and your internet connection." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:426 #, java-format msgid "" "The server reports that an object is deleted.
Uploading " "failed if you tried to update or delete this object.
" -"Downloading failed if you tried to download this " -"object.

The error message is:
{0}" +"Downloading failed if you tried to download this object." +"

The error message is:
{0}" msgstr "" @@ -13824,5 +13641,5 @@ #, java-format msgid "" -"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window " +"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window " "geometry from preferences." msgstr "" @@ -13832,5 +13649,5 @@ msgid "" "Preference with key ''{0}'' does not provide an int value for ''{1}''. Got " -"{2}. Can''t restore window geometry from preferences." +"{2}. Cannot restore window geometry from preferences." msgstr "" @@ -13839,5 +13656,5 @@ msgid "" "Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: " -"{2}. Can''t restore window geometry from preferences." +"{2}. Cannot restore window geometry from preferences." msgstr "" @@ -13845,5 +13662,5 @@ #, java-format msgid "" -"Preference with key ''{0}'' does not exist. Can''t restore window geometry " +"Preference with key ''{0}'' does not exist. Cannot restore window geometry " "from preferences." msgstr "" @@ -13990,5 +13807,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2146 msgid "Address Interpolation" msgstr "Interpoler adresser" @@ -14294,17 +14111,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "" -"A special handler of the French cadastre wms at " -"www.cadastre.gouv.fr

Please read the Terms and Conditions of Use here " -"(in French):
" -"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " -"
before any upload of data created by this plugin." -msgstr "" -"Et eget programtillegg for fransk Cadastre wms (matrikkel) på " -"www.cadastre.gouv.fr

Du finner betingelser for bruk her (på fransk): " -"
" +"A special handler of the French cadastre wms at www.cadastre.gouv." +"fr

Please read the Terms and Conditions of Use here (in French): " +"
 http://www.cadastre.gouv.fr/scpc/html/" +"CU_01_ConditionsGenerales_fr.html
before any upload of data created " +"by this plugin." +msgstr "" +"Et eget programtillegg for fransk Cadastre wms (matrikkel) på www.cadastre." +"gouv.fr

Du finner betingelser for bruk her (på fransk):
" "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " "
før du laster inn data med dette programtillegget." @@ -14317,6 +14131,6 @@ msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -"Verdien på \"source\" er aktivisert ved automatisk " -"kildeangivelse" +"Verdien på \"source\" er aktivisert ved automatisk kildeangivelse" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 @@ -14587,5 +14401,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2199 msgid "Location" msgstr "Område" @@ -14749,21 +14563,21 @@ msgstr "" -#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:34 +#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35 msgid "TangoGPS Files (*.log)" msgstr "TangoGPS-filer (*.log)" -#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:111 +#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113 msgid "Format errors: " msgstr "Formatfeil: " -#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113 +#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115 msgid "TangoGPS import success" msgstr "TangoGPS-data importert" -#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115 +#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117 msgid "TangoGPS import failure!" msgstr "Klarte ikke importere TangoGPS-data." -#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:66 +#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67 msgid "TCX Files (*.tcx)" msgstr "TCX filer (*.tcx)" @@ -15096,5 +14910,5 @@ #. * #. * Run the nodelist through a vertex reduction algorithm -#. +#. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188 msgid "Running vertex reduction..." @@ -15156,7 +14970,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -15166,5 +14980,5 @@ #. 50000 #. -#. +#. #. #. @@ -15174,5 +14988,12 @@ #. 50000 #. -#. +#. +#. +#. +#. color water +#. +#. 1 +#. 50000 +#. #. #. @@ -15181,5 +15002,5 @@ #. 50000 #. -#. +#. #. #. @@ -15189,12 +15010,13 @@ #. 50000 #. -#. +#. #. #. #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22 -#: build/trans_presets.java:2337 build/trans_style.java:993 +#: build/trans_presets.java:2198 build/trans_style.java:993 #: build/trans_style.java:1010 build/trans_style.java:1026 -#: build/trans_style.java:3461 build/trans_style.java:3469 +#: build/trans_style.java:1033 build/trans_style.java:3492 +#: build/trans_style.java:3500 msgid "water" msgstr "vann" @@ -15265,6 +15087,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70 -msgid "" -"Maximum number of segments allowed in each generated way. Default 250." +msgid "Maximum number of segments allowed in each generated way. Default 250." msgstr "" "Maksimalt antall segmenter tillatt i hver opptegnede linje. Standard er 250." @@ -15287,7 +15108,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in " -"degrees.
Lower values give more nodes, and more accurate lines. Default " -"0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in degrees." +"
Lower values give more nodes, and more accurate lines. Default 0.0003." msgstr "" "Nøyaktighet på Douglas-Peucker linjeforenkling, målt i grader.
Lave " @@ -15561,7 +15381,7 @@ "new server? (Strongly recommended)" msgstr "" -"Openstreetbugs-tillegget bruker den gamle tjeneren på " -"appspot.com.
En ny tjener er tilgjengelig på schokokeks.org.
Vil du " -"bytte til den nye tjeneren? (Anbefalt)" +"Openstreetbugs-tillegget bruker den gamle tjeneren på appspot.com." +"
En ny tjener er tilgjengelig på schokokeks.org.
Vil du bytte til den " +"nye tjeneren? (Anbefalt)" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 @@ -15588,6 +15408,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "" -"Header contains several values and cannot be mapped to a single string" +msgid "Header contains several values and cannot be mapped to a single string" msgstr "Header inneholder flere verdier og kan ikke kobles til enkelt streng" @@ -15701,6 +15520,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65 -msgid "" -"You have unsaved changes in your queue. Do you want to submit them now?" +msgid "You have unsaved changes in your queue. Do you want to submit them now?" msgstr "" @@ -15769,6 +15587,5 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "A plugin that allows JOSM to be controlled from other applications." -msgstr "" -"Et programtillegg som tillater at JOSM blir styrt av et annet program" +msgstr "Et programtillegg som tillater at JOSM blir styrt av et annet program" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36 @@ -16223,10 +16040,9 @@ msgstr "Ingen valideringsfeil" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:172 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 msgid "Grid" msgstr "Rutenett" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276 #, java-format msgid "" @@ -16313,23 +16129,23 @@ msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 msgid "Validation" msgstr "Validering" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:44 msgid "Performs the data validation" msgstr "Kjører datavalidering" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:120 msgid "Validating" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:161 #, java-format msgid "Test {0}/{1}: Starting {2}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:170 msgid "Updating ignored errors ..." msgstr "" @@ -16396,4 +16212,11 @@ msgid "Replace \"{0}\" by \"{1}\" for" msgstr "Erstatt «{0}» med «{1}» for" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "objekt" +msgstr[1] "objekter" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41 @@ -16444,4 +16267,14 @@ msgstr "Denne testen sjekker at det ikke er flere Noder med samme posisjon." +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"Du er i ferd med å slette noder utenfor nedlastet område.
Dette kan skape " +"problemer fordi de kan være i bruk av andre objekter (som du ikke kan se " +"nå) .
Er du sikker på at du vil slette nodene?" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149 msgid "Confirmation" @@ -16481,5 +16314,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25 -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3017 msgid "Multipolygon" msgstr "Multipolygon" @@ -16599,6 +16432,5 @@ msgid "" "This test checks for ways with similar names that may have been misspelled." -msgstr "" -"Denne test sjekker linjer med liknende navn, som kan bety feilstaving." +msgstr "Denne test sjekker linjer med liknende navn, som kan bety feilstaving." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 @@ -16610,15 +16442,15 @@ msgstr "Denne programutvidelsen kontrollerer egenskapers nøkler og verdier." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Ugyldig egenskapskontroll-linje – {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Ugyldig stavekontroll linje: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 #, java-format msgid "" @@ -16629,7 +16461,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:428 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:438 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439 msgid "Illegal tag/value combinations" msgstr "Ulovlige kombinasjoner Egenskap / Verdi" @@ -16637,171 +16469,169 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:453 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454 msgid "Painting problem" msgstr "Problem med visning" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:463 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464 #, java-format msgid "Key ''{0}'' invalid." msgstr "Nøkkel «{0}» er ugyldig." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469 msgid "Tags with empty values" msgstr "Egenskaper uten verdier" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Invalid property key" msgstr "Ulovlig egenskapsnøkkel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid white space in property key" msgstr "Ulovlig mellomrom i Nøkkel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Property values start or end with white space" msgstr "Egenskap Verdi starter eller slutter med mellomrom" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:492 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values contain HTML entity" msgstr "Egenskap Verdi inneholder HTML koding" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Nøkkel «{0}» finnes ikke i objektmalene" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521 msgid "Presets do not contain property key" msgstr "Objektmalene inneholder ikke Nøkkelen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Verdi «{0}» for nøkkel «{1}» finnes ikke i objektmalene" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544 msgid "Presets do not contain property value" msgstr "Objektmalen har ikke Egenskapsverdi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:555 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556 msgid "FIXMES" msgstr "FIXMEs" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Check property keys." msgstr "Sjekk egenskabsnøkler" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604 msgid "Validate that property keys are valid checking against list of words." msgstr "Bekreft at egenskabsnøklene kan sjekkes mot en ordliste." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611 msgid "Use complex property checker." msgstr "Bruk avansert egenskapskontroll." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612 msgid "Validate property values and tags using complex rules." msgstr "Kontroller egenskapsverdiene med hjelp av avanserte regler." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:632 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 msgid "TagChecker source" msgstr "Egenskapskontroll-kilde" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:695 -msgid "" -"The sources (URL or filename) of spell check (see " -"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " -"data files." -msgstr "" -"Kildene (URL eller filnavn) for stavekontroll (se " -"http://wiki.openstreetmap.org/index.php/User:JLS/speller) eller \"tag " -"checking data files\"." - #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696 +msgid "" +"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." +"org/index.php/User:JLS/speller) or tag checking data files." +msgstr "" +"Kildene (URL eller filnavn) for stavekontroll (se http://wiki.openstreetmap." +"org/index.php/User:JLS/speller) eller \"tag checking data files\"." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 msgid "Add a new source to the list." msgstr "Tilføy en ny kilde til lista." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 msgid "Edit the selected source." msgstr "Rediger valgt kilde." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 msgid "Delete the selected source from the list." msgstr "Slett den valgte kilden fra lista." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 msgid "Data sources" msgstr "Datakilder" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Check property values." msgstr "Sjekk egenskapsverdier." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 msgid "Validate that property values are valid checking against presets." msgstr "Bekreft at du vil sjekke egenskapsverdiene imot Objektmalene." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check for FIXMES." msgstr "Se etter FIXMEs" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Søker etter noder eller linjer med FIXME i en egenskapsverdi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Check for paint notes." msgstr "Finn notater om tegning." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738 msgid "Check if map painting found data errors." msgstr "Sjekk etter feil ved opptegning." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use default data file." msgstr "Bruk standard datafil." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746 msgid "Use the default data file (recommended)." msgstr "Bruk standard datafil (anbefales)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 msgid "Use default spellcheck file." msgstr "Bruk standard fil for stavekontroll." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754 msgid "Use the default spellcheck file (recommended)." msgstr "Brug standard fil for stavekontroll (anbefales)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:847 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848 msgid "Fix properties" msgstr "Korriger egenskaper" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:968 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "Kunne ikke finne element-typen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 msgid "Could not find warning level" msgstr "Kunne ikke finne advarsels-niveå" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:994 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995 #, java-format msgid "Illegal expression ''{0}''" msgstr "Ugyldig uttrykk «{0}»" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999 #, java-format msgid "Illegal regular expression ''{0}''" @@ -16860,5 +16690,5 @@ #. 50000 #. -#. +#. #. #. @@ -16866,5 +16696,5 @@ #. #. -#. +#. #. #. @@ -16874,5 +16704,5 @@ #. 50000 #. -#. +#. #. #. @@ -16881,5 +16711,5 @@ #. 50000 #. -#. +#. #. #. @@ -16888,5 +16718,5 @@ #. 50000 #. -#. +#. #. #. @@ -16895,5 +16725,5 @@ #. 50000 #. -#. +#. #. #. @@ -16902,5 +16732,5 @@ #. 50000 #. -#. +#. #. #. @@ -16909,14 +16739,14 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4261 +#: build/trans_style.java:4292 msgid "building" msgstr "bygning" @@ -16926,9 +16756,9 @@ #. 50000 #. -#. +#. #. #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4268 +#: build/trans_style.java:4299 msgid "area" msgstr "område" @@ -16969,6 +16799,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38 msgid "This test checks for untagged nodes that are not part of any way." -msgstr "" -"Sjekker for noder uten egenskaper som heller ikke tilhører noen linje." +msgstr "Sjekker for noder uten egenskaper som heller ikke tilhører noen linje." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59 @@ -17006,6 +16835,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35 msgid "This test checks the direction of water, land and coastline ways." -msgstr "" -"Testen finner linjer som elver, land eller kystlinje med feil retning." +msgstr "Testen finner linjer som elver, land eller kystlinje med feil retning." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69 @@ -17386,5 +17214,5 @@ #. This file can be used to add some special messages to the translation, #. which are not part of the programm texts, but should be translated nevertheless. -#. +#. #: build/specialmessages.java:6 msgid "" @@ -17490,6 +17318,5 @@ #. Plugin globalsat #: build/trans_plugins.java:21 -msgid "" -"Download GPS points from Globalsat dg100 data logger directly in JOSM." +msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "Last ned GPS punkt fra Globalsat dg100 data logger direkte til JOSM" @@ -17677,10 +17504,9 @@ msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." -msgstr "" -"Vis koordinatfestet bilde som bakgrunn i JOSM (WMS-tjenere, Yahoo, …)." +msgstr "Vis koordinatfestet bilde som bakgrunn i JOSM (WMS-tjenere, Yahoo, …)." #. #. -#. +#. #. #. @@ -18743,74 +18504,52 @@ #. #. -#: build/trans_presets.java:335 build/trans_presets.java:336 -#: build/trans_presets.java:337 build/trans_presets.java:338 -#: build/trans_presets.java:339 build/trans_presets.java:340 -#: build/trans_presets.java:341 build/trans_presets.java:342 -#: build/trans_presets.java:343 build/trans_presets.java:344 -#: build/trans_presets.java:345 build/trans_presets.java:541 -#: build/trans_presets.java:542 build/trans_presets.java:543 -#: build/trans_presets.java:562 build/trans_presets.java:563 -#: build/trans_presets.java:564 build/trans_presets.java:583 -#: build/trans_presets.java:584 build/trans_presets.java:585 -#: build/trans_presets.java:604 build/trans_presets.java:605 -#: build/trans_presets.java:606 build/trans_presets.java:625 -#: build/trans_presets.java:626 build/trans_presets.java:627 -#: build/trans_presets.java:646 build/trans_presets.java:647 -#: build/trans_presets.java:648 build/trans_style.java:205 +#: build/trans_presets.java:353 build/trans_presets.java:354 +#: build/trans_presets.java:355 build/trans_presets.java:356 +#: build/trans_presets.java:357 build/trans_presets.java:358 +#: build/trans_presets.java:359 build/trans_presets.java:360 +#: build/trans_presets.java:361 build/trans_presets.java:362 +#: build/trans_presets.java:363 build/trans_presets.java:464 +#: build/trans_presets.java:465 build/trans_presets.java:466 +#: build/trans_style.java:205 msgid "permissive" msgstr "permissive" -#: build/trans_presets.java:335 build/trans_presets.java:339 -#: build/trans_presets.java:342 build/trans_presets.java:541 -#: build/trans_presets.java:542 build/trans_presets.java:543 -#: build/trans_presets.java:562 build/trans_presets.java:563 -#: build/trans_presets.java:564 build/trans_presets.java:583 -#: build/trans_presets.java:584 build/trans_presets.java:585 -#: build/trans_presets.java:604 build/trans_presets.java:605 -#: build/trans_presets.java:606 build/trans_presets.java:625 -#: build/trans_presets.java:626 build/trans_presets.java:627 -#: build/trans_presets.java:646 build/trans_presets.java:647 -#: build/trans_presets.java:648 +#: build/trans_presets.java:353 build/trans_presets.java:357 +#: build/trans_presets.java:360 build/trans_presets.java:464 +#: build/trans_presets.java:465 build/trans_presets.java:466 msgid "agricultural" msgstr "Skog- og Landbruk" #. item "Amenities/Toilets" combo "Wheelchair" -#: build/trans_presets.java:335 build/trans_presets.java:336 -#: build/trans_presets.java:337 build/trans_presets.java:338 -#: build/trans_presets.java:339 build/trans_presets.java:340 -#: build/trans_presets.java:341 build/trans_presets.java:342 -#: build/trans_presets.java:343 build/trans_presets.java:344 -#: build/trans_presets.java:345 build/trans_presets.java:461 -#: build/trans_presets.java:481 build/trans_presets.java:541 -#: build/trans_presets.java:542 build/trans_presets.java:543 -#: build/trans_presets.java:562 build/trans_presets.java:563 -#: build/trans_presets.java:564 build/trans_presets.java:583 -#: build/trans_presets.java:584 build/trans_presets.java:585 -#: build/trans_presets.java:604 build/trans_presets.java:605 -#: build/trans_presets.java:606 build/trans_presets.java:625 -#: build/trans_presets.java:626 build/trans_presets.java:627 -#: build/trans_presets.java:646 build/trans_presets.java:647 -#: build/trans_presets.java:648 build/trans_presets.java:661 -#: build/trans_presets.java:662 build/trans_presets.java:663 -#: build/trans_presets.java:664 build/trans_presets.java:665 -#: build/trans_presets.java:666 build/trans_presets.java:785 -#: build/trans_presets.java:800 build/trans_presets.java:1344 -#: build/trans_presets.java:1407 build/trans_presets.java:1408 -#: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1532 -#: build/trans_presets.java:1533 build/trans_presets.java:1534 -#: build/trans_presets.java:1767 build/trans_presets.java:1777 -#: build/trans_presets.java:2427 build/trans_presets.java:2428 -#: build/trans_presets.java:2464 build/trans_presets.java:2473 -#: build/trans_presets.java:2474 build/trans_presets.java:2475 -#: build/trans_presets.java:2759 +#: build/trans_presets.java:353 build/trans_presets.java:354 +#: build/trans_presets.java:355 build/trans_presets.java:356 +#: build/trans_presets.java:357 build/trans_presets.java:358 +#: build/trans_presets.java:359 build/trans_presets.java:360 +#: build/trans_presets.java:361 build/trans_presets.java:362 +#: build/trans_presets.java:363 build/trans_presets.java:464 +#: build/trans_presets.java:465 build/trans_presets.java:466 +#: build/trans_presets.java:486 build/trans_presets.java:487 +#: build/trans_presets.java:488 build/trans_presets.java:489 +#: build/trans_presets.java:490 build/trans_presets.java:491 +#: build/trans_presets.java:492 build/trans_presets.java:531 +#: build/trans_presets.java:594 build/trans_presets.java:646 +#: build/trans_presets.java:661 build/trans_presets.java:1205 +#: build/trans_presets.java:1268 build/trans_presets.java:1269 +#: build/trans_presets.java:1272 build/trans_presets.java:1273 +#: build/trans_presets.java:1274 build/trans_presets.java:1393 +#: build/trans_presets.java:1394 build/trans_presets.java:1395 +#: build/trans_presets.java:1628 build/trans_presets.java:1638 +#: build/trans_presets.java:2288 build/trans_presets.java:2289 +#: build/trans_presets.java:2325 build/trans_presets.java:2334 +#: build/trans_presets.java:2335 build/trans_presets.java:2336 +#: build/trans_presets.java:2620 msgid "no" msgstr "nei" -#: build/trans_presets.java:338 +#: build/trans_presets.java:356 msgid "Goods" msgstr "Varer" -#: build/trans_presets.java:339 +#: build/trans_presets.java:357 msgid "Heavy Goods Vehicles (hgv)" msgstr "Tung last (hgv)" @@ -18825,10 +18564,10 @@ #. item "Barriers/Bump Gate" check "Bicycle" #. item "Barriers/Sally Port" check "Bicycle" -#: build/trans_presets.java:340 build/trans_presets.java:663 -#: build/trans_presets.java:870 build/trans_presets.java:903 -#: build/trans_presets.java:925 build/trans_presets.java:962 -#: build/trans_presets.java:975 build/trans_presets.java:987 -#: build/trans_presets.java:999 build/trans_presets.java:1011 -#: build/trans_presets.java:1051 +#: build/trans_presets.java:358 build/trans_presets.java:488 +#: build/trans_presets.java:731 build/trans_presets.java:764 +#: build/trans_presets.java:786 build/trans_presets.java:823 +#: build/trans_presets.java:836 build/trans_presets.java:848 +#: build/trans_presets.java:860 build/trans_presets.java:872 +#: build/trans_presets.java:912 msgid "Horse" msgstr "Hest" @@ -18844,13 +18583,10 @@ #. item "Barriers/Bump Gate" check "Horse" #. item "Barriers/Sally Port" check "Horse" -#: build/trans_presets.java:341 build/trans_presets.java:542 -#: build/trans_presets.java:563 build/trans_presets.java:584 -#: build/trans_presets.java:605 build/trans_presets.java:626 -#: build/trans_presets.java:647 build/trans_presets.java:871 -#: build/trans_presets.java:889 build/trans_presets.java:904 -#: build/trans_presets.java:926 build/trans_presets.java:963 -#: build/trans_presets.java:976 build/trans_presets.java:988 -#: build/trans_presets.java:1000 build/trans_presets.java:1012 -#: build/trans_presets.java:1052 +#: build/trans_presets.java:359 build/trans_presets.java:465 +#: build/trans_presets.java:732 build/trans_presets.java:750 +#: build/trans_presets.java:765 build/trans_presets.java:787 +#: build/trans_presets.java:824 build/trans_presets.java:837 +#: build/trans_presets.java:849 build/trans_presets.java:861 +#: build/trans_presets.java:873 build/trans_presets.java:913 msgid "Motorcycle" msgstr "Motorsykkel" @@ -18865,30 +18601,27 @@ #. item "Barriers/Bump Gate" check "Motorcycle" #. item "Barriers/Sally Port" check "Motorcycle" -#: build/trans_presets.java:342 build/trans_presets.java:543 -#: build/trans_presets.java:564 build/trans_presets.java:585 -#: build/trans_presets.java:606 build/trans_presets.java:627 -#: build/trans_presets.java:648 build/trans_presets.java:666 -#: build/trans_presets.java:890 build/trans_presets.java:905 -#: build/trans_presets.java:927 build/trans_presets.java:964 -#: build/trans_presets.java:977 build/trans_presets.java:989 -#: build/trans_presets.java:1001 build/trans_presets.java:1013 -#: build/trans_presets.java:1053 +#: build/trans_presets.java:360 build/trans_presets.java:466 +#: build/trans_presets.java:492 build/trans_presets.java:751 +#: build/trans_presets.java:766 build/trans_presets.java:788 +#: build/trans_presets.java:825 build/trans_presets.java:838 +#: build/trans_presets.java:850 build/trans_presets.java:862 +#: build/trans_presets.java:874 build/trans_presets.java:914 msgid "Motorcar" msgstr "Motorkjøretøy" -#: build/trans_presets.java:343 +#: build/trans_presets.java:361 msgid "Public Service Vehicles (psv)" msgstr "Offentlige Tjenestekjøretøy (psv)" -#: build/trans_presets.java:344 +#: build/trans_presets.java:362 msgid "Motorboat" msgstr "Motorbåt" -#: build/trans_presets.java:345 +#: build/trans_presets.java:363 msgid "Boat" msgstr "Båt" #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)" -#: build/trans_presets.java:347 +#: build/trans_presets.java:365 msgid "Min. speed (km/h)" msgstr "Min. hastighet (km/t)" @@ -18896,25 +18629,25 @@ #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)" #. item "Highways/Streets/Bridge" text "Max. speed (km/h)" -#: build/trans_presets.java:348 build/trans_presets.java:386 +#: build/trans_presets.java:366 build/trans_presets.java:404 msgid "Max. weight (tonnes)" msgstr "maks totalvekt" #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:349 +#: build/trans_presets.java:367 msgid "Max. Height (meters)" msgstr "Max. Høyde (meter)" #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:350 +#: build/trans_presets.java:368 msgid "Max. Width (meters)" msgstr "Max. Bredde (meter)" #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:351 +#: build/trans_presets.java:369 msgid "Max. Length (meters)" msgstr "Max. Lengde (meter)" #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:353 +#: build/trans_presets.java:371 msgid "Roundabout" msgstr "Rundkjøring" @@ -18925,5 +18658,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout" #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" /> -#: build/trans_presets.java:358 +#: build/trans_presets.java:376 msgid "Edit Junction" msgstr "Rediger kryss" @@ -18932,5 +18665,5 @@ #. color motorroad #. -#. +#. #. #. @@ -18940,13 +18673,13 @@ #. 200000000 #. -#. +#. #. #. -#: build/trans_presets.java:361 build/trans_style.java:553 +#: build/trans_presets.java:379 build/trans_style.java:553 #: build/trans_style.java:561 msgid "motorway" msgstr "motorway" -#: build/trans_presets.java:361 +#: build/trans_presets.java:379 msgid "motorway_link" msgstr "motorway_link" @@ -18957,5 +18690,5 @@ #. 200000000 #. -#. +#. #. #. @@ -18965,13 +18698,13 @@ #. 200000000 #. -#. +#. #. #. -#: build/trans_presets.java:361 build/trans_style.java:569 +#: build/trans_presets.java:379 build/trans_style.java:569 #: build/trans_style.java:577 msgid "trunk" msgstr "trunk" -#: build/trans_presets.java:361 +#: build/trans_presets.java:379 msgid "trunk_link" msgstr "trunk_link" @@ -18982,5 +18715,5 @@ #. 200000000 #. -#. +#. #. #. @@ -18990,13 +18723,13 @@ #. 200000000 #. -#. +#. #. #. -#: build/trans_presets.java:361 build/trans_style.java:585 +#: build/trans_presets.java:379 build/trans_style.java:585 #: build/trans_style.java:593 msgid "primary" msgstr "riksvei" -#: build/trans_presets.java:361 +#: build/trans_presets.java:379 msgid "primary_link" msgstr "tilkjørselsvei_riksvei" @@ -19007,5 +18740,5 @@ #. 200000000 #. -#. +#. #. #. @@ -19015,8 +18748,8 @@ #. 300000 #. -#. +#. #. #. -#: build/trans_presets.java:361 build/trans_style.java:601 +#: build/trans_presets.java:379 build/trans_style.java:601 #: build/trans_style.java:609 msgid "secondary" @@ -19028,12 +18761,12 @@ #. 300000 #. -#. +#. #. #. -#: build/trans_presets.java:361 build/trans_style.java:617 +#: build/trans_presets.java:379 build/trans_style.java:617 msgid "tertiary" msgstr "kommunevei" -#: build/trans_presets.java:361 +#: build/trans_presets.java:379 msgid "unclassified" msgstr "småvei" @@ -19044,12 +18777,12 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_presets.java:361 build/trans_style.java:3221 +#: build/trans_presets.java:379 build/trans_style.java:3252 msgid "residential" msgstr "boligvei" -#: build/trans_presets.java:361 +#: build/trans_presets.java:379 msgid "living_street" msgstr "gatetun" @@ -19060,5 +18793,5 @@ #. 40000 #. -#. +#. #. #. @@ -19067,5 +18800,5 @@ #. 40000 #. -#. +#. #. #. @@ -19075,14 +18808,14 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_presets.java:361 build/trans_style.java:673 -#: build/trans_style.java:4326 +#: build/trans_presets.java:379 build/trans_style.java:673 +#: build/trans_style.java:4357 msgid "service" msgstr "adkomstvei" -#: build/trans_presets.java:361 +#: build/trans_presets.java:379 msgid "bus_guideway" msgstr "trikkespor" @@ -19093,5 +18826,5 @@ #. 50000 #. -#. +#. #. #. @@ -19100,5 +18833,5 @@ #. 50000 #. -#. +#. #. #. @@ -19108,10 +18841,10 @@ #. 50000 #. -#. +#. #. #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:880 -#: build/trans_style.java:3286 build/trans_style.java:3287 +#: build/trans_presets.java:379 build/trans_style.java:880 +#: build/trans_style.java:3317 build/trans_style.java:3318 msgid "construction" msgstr "veiarbeid" @@ -19122,10 +18855,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" /> -#: build/trans_presets.java:379 +#: build/trans_presets.java:397 msgid "Edit Bridge" msgstr "Rediger bro" #. item "Highways/Streets/Tunnel" -#: build/trans_presets.java:391 +#: build/trans_presets.java:409 msgid "Edit Tunnel" msgstr "Rediger tunnel" @@ -19133,19 +18866,19 @@ #. item "Highways/Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:405 +#: build/trans_presets.java:423 msgid "Ways" msgstr "Gater" #. group "Ways" -#: build/trans_presets.java:406 +#: build/trans_presets.java:424 msgid "Construction" msgstr "Veiarbeid" #. item "Ways/Construction" -#: build/trans_presets.java:407 +#: build/trans_presets.java:425 msgid "Edit Highway Under Construction" msgstr "Rediger vei under bygging" -#: build/trans_presets.java:423 +#: build/trans_presets.java:441 msgid "Junction" msgstr "Kryss" @@ -19156,10 +18889,10 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. -#: build/trans_presets.java:423 build/trans_style.java:898 +#: build/trans_presets.java:441 build/trans_style.java:898 msgid "roundabout" msgstr "rundkjøring" @@ -19167,68 +18900,192 @@ #. item "Ways/Construction" text "Width (meters)" #. +#: build/trans_presets.java:446 +msgid "Track" +msgstr "Traktorvei" + +#. item "Ways/Track" +#. +#: build/trans_presets.java:449 +msgid "Edit Track" +msgstr "Rediger traktorvei" + +#: build/trans_presets.java:460 +#, fuzzy +msgid "Tracktype" +msgstr "Traktorvei" + +#. item "Ways/Track" combo "Tracktype" +#: build/trans_presets.java:460 +#, fuzzy +msgid "grade1" +msgstr "grus" + +#: build/trans_presets.java:460 +#, fuzzy +msgid "grade2" +msgstr "grus" + +#: build/trans_presets.java:460 +#, fuzzy +msgid "grade3" +msgstr "grus" + +#: build/trans_presets.java:460 +#, fuzzy +msgid "grade4" +msgstr "grus" + +#: build/trans_presets.java:460 +#, fuzzy +msgid "grade5" +msgstr "grus" + +#: build/trans_presets.java:461 build/trans_presets.java:484 +msgid "MTB Scale" +msgstr "" + +#. item "Ways/Track" combo "MTB Scale" +#. item "Ways/Path" combo "MTB Scale" +#: build/trans_presets.java:462 build/trans_presets.java:485 +msgid "SAC Scale" +msgstr "" + +#. item "Ways/Track" combo "SAC Scale" +#. item "Ways/Path" combo "SAC Scale" +#: build/trans_presets.java:462 build/trans_presets.java:485 +#: build/trans_presets.java:3051 +msgid "hiking" +msgstr "tur" + +#: build/trans_presets.java:462 build/trans_presets.java:485 +#, fuzzy +msgid "mountain_hiking" +msgstr "Fjellsti" + +#: build/trans_presets.java:462 build/trans_presets.java:485 +#, fuzzy +msgid "demanding_mountain_hiking" +msgstr "Krevende fjellsti" + +#: build/trans_presets.java:462 build/trans_presets.java:485 +#, fuzzy +msgid "alpine_hiking" +msgstr "Alpin fjellsti" + +#: build/trans_presets.java:462 build/trans_presets.java:485 +#, fuzzy +msgid "demanding_alpine_hiking" +msgstr "Krevende alpin fjellsti" + +#: build/trans_presets.java:462 build/trans_presets.java:485 +#, fuzzy +msgid "difficult_alpine_hiking" +msgstr "Vanskelig alpin fjellsti" + +#. item "Ways/Track" text "Width (meters)" +#. +#: build/trans_presets.java:470 +msgid "Path" +msgstr "Sti" + +#. item "Ways/Path" +#. +#: build/trans_presets.java:473 +msgid "Edit Path" +msgstr "Rediger sti" + +#: build/trans_presets.java:489 +#, fuzzy +msgid "Wheelchairs" +msgstr "Rullestol" + +#: build/trans_presets.java:490 +msgid "Ski" +msgstr "Ski" + +#: build/trans_presets.java:491 +msgid "Snowmobile" +msgstr "Snøscooter" + +#. item "Ways/Path" text "Width (meters)" +#. #. -#: build/trans_presets.java:429 -msgid "Bridleway" -msgstr "Ridevei" - -#. item "Ways/Bridleway" +#: build/trans_presets.java:499 +#, fuzzy +msgid "Dedicated Bridleway" +msgstr "Rediger ridevei" + +#. item "Ways/Dedicated Bridleway" #. -#: build/trans_presets.java:431 +#: build/trans_presets.java:501 msgid "Edit Bridleway" msgstr "Rediger ridevei" -#. item "Ways/Bridleway" text "Width (meters)" +#. item "Ways/Dedicated Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:447 -msgid "Cycleway" -msgstr "Sykkelvei" - -#. item "Ways/Cycleway" +#: build/trans_presets.java:517 +#, fuzzy +msgid "Dedicated Cycleway" +msgstr "Rediger sykkelvei" + +#. item "Ways/Dedicated Cycleway" #. -#: build/trans_presets.java:451 +#. item "Ways/Segregated Foot- and Cycleway" +#. +#. item "Ways/Combined Foot- and Cycleway" +#. +#: build/trans_presets.java:521 build/trans_presets.java:541 +#: build/trans_presets.java:563 msgid "Edit Cycleway" msgstr "Rediger sykkelvei" -#. item "Ways/Cycleway" check "Embankment" -#: build/trans_presets.java:461 +#. item "Ways/Dedicated Cycleway" check "Embankment" +#: build/trans_presets.java:531 msgid "Pedestrians" msgstr "" -#. item "Ways/Cycleway" text "Width (meters)" +#. item "Ways/Dedicated Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:468 -msgid "Footway" -msgstr "Gangvei" - -#. item "Ways/Footway" +#: build/trans_presets.java:537 +msgid "Segregated Foot- and Cycleway" +msgstr "" + +#. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)" +#. +#: build/trans_presets.java:559 +#, fuzzy +msgid "Combined Foot- and Cycleway" +msgstr "Sammenføy uansett" + +#. item "Ways/Combined Foot- and Cycleway" text "Width (meters)" +#. +#: build/trans_presets.java:581 +#, fuzzy +msgid "Dedicated Footway" +msgstr "Rediger gangvei" + +#. item "Ways/Dedicated Footway" #. -#: build/trans_presets.java:471 +#: build/trans_presets.java:584 msgid "Edit Footway" msgstr "Rediger gangvei" -#. item "Ways/Footway" check "Embankment" -#: build/trans_presets.java:481 +#. item "Ways/Dedicated Footway" check "Embankment" +#: build/trans_presets.java:594 msgid "Bikes" msgstr "" -#. item "Ways/Footway" text "Width (meters)" +#. item "Ways/Dedicated Footway" text "Width (meters)" #. -#: build/trans_presets.java:488 -msgid "Pedestrian" -msgstr "Gågate" - -#. item "Ways/Pedestrian" -#. -#: build/trans_presets.java:491 -msgid "Edit Pedestrian Street" -msgstr "Rediger gågate" - -#. item "Ways/Pedestrian" text "Width (meters)" -#. -#: build/trans_presets.java:506 +#: build/trans_presets.java:601 msgid "Steps" msgstr "Trapper" @@ -19238,5 +19095,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" /> -#: build/trans_presets.java:510 +#: build/trans_presets.java:605 msgid "Edit Flight of Steps" msgstr "Rediger trapper" @@ -19244,198 +19101,10 @@ #. item "Ways/Steps" text "Width (meters)" #. -#. -#: build/trans_presets.java:527 -msgid "Track" -msgstr "Traktorvei" - -#. item "Ways/Track" -#. -#: build/trans_presets.java:530 -msgid "Edit Track" -msgstr "Rediger traktorvei" - -#. item "Ways/Track" text "Width (meters)" -#. -#: build/trans_presets.java:547 -msgid "Track Grade 1" -msgstr "Traktorvei klasse 1" - -#. item "Ways/Track Grade 1" -#. -#: build/trans_presets.java:550 -msgid "Edit Track of grade 1" -msgstr "Rediger traktorvei klasse 1" - -#. item "Ways/Track Grade 1" text "Width (meters)" -#. -#: build/trans_presets.java:568 -msgid "Track Grade 2" -msgstr "Traktorvei klasse 2" - -#. item "Ways/Track Grade 2" -#. -#: build/trans_presets.java:571 -msgid "Edit Track of grade 2" -msgstr "Rediger traktorvei klasse 2" - -#. item "Ways/Track Grade 2" text "Width (meters)" -#. -#: build/trans_presets.java:589 -msgid "Track Grade 3" -msgstr "Traktorvei klasse 3" - -#. item "Ways/Track Grade 3" -#. -#: build/trans_presets.java:592 -msgid "Edit Track of grade 3" -msgstr "Rediger traktorvei klasse 3" - -#. item "Ways/Track Grade 3" text "Width (meters)" -#. -#: build/trans_presets.java:610 -msgid "Track Grade 4" -msgstr "Traktorvei klasse 4" - -#. item "Ways/Track Grade 4" -#. -#: build/trans_presets.java:613 -msgid "Edit Track of grade 4" -msgstr "Rediger traktorvei klasse 4" - -#. item "Ways/Track Grade 4" text "Width (meters)" -#. -#: build/trans_presets.java:631 -msgid "Track Grade 5" -msgstr "Traktorvei klasse 5" - -#. item "Ways/Track Grade 5" -#. -#: build/trans_presets.java:634 -msgid "Edit Track of grade 5" -msgstr "Rediger traktorvei klasse 5" - -#. item "Ways/Track Grade 5" text "Width (meters)" -#. -#. -#: build/trans_presets.java:653 -msgid "Path" -msgstr "Sti" - -#. item "Ways/Path" -#. -#: build/trans_presets.java:656 -msgid "Edit Path" -msgstr "Rediger sti" - -#: build/trans_presets.java:664 -msgid "Ski" -msgstr "Ski" - -#: build/trans_presets.java:665 -msgid "Snowmobile" -msgstr "Snøscooter" - -#. item "Ways/Path" text "Width (meters)" -#. -#. item "Tourism/Map" label "Routes shown for:" -#. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1729 -#: build/trans_presets.java:1752 -msgid "Hiking" -msgstr "Tursti" - -#. item "Ways/Hiking" -#. -#: build/trans_presets.java:686 -msgid "Edit Hiking" -msgstr "Rediger tursti" - -#. item "Ways/Hiking" text "Width (meters)" -#. -#: build/trans_presets.java:695 -msgid "Mountain Hiking" -msgstr "Fjellsti" - -#. item "Ways/Mountain Hiking" -#. -#: build/trans_presets.java:699 -msgid "Edit Mountain Hiking" -msgstr "Rediger fjellsti" - -#. item "Ways/Mountain Hiking" text "Width (meters)" -#. -#: build/trans_presets.java:708 -msgid "Demanding Mountain Hiking" -msgstr "Krevende fjellsti" - -#. item "Ways/Demanding Mountain Hiking" -#. -#: build/trans_presets.java:712 -msgid "Edit Demanding Mountain Hiking" -msgstr "Rediger krevende fjellsti" - -#. item "Ways/Demanding Mountain Hiking" text "Width (meters)" -#. -#: build/trans_presets.java:721 -msgid "Alpine Hiking" -msgstr "Alpin fjellsti" - -#. item "Ways/Alpine Hiking" -#. -#: build/trans_presets.java:725 -msgid "Edit Alpine Hiking" -msgstr "Rediger alpin fjellsti" - -#. item "Ways/Alpine Hiking" text "Width (meters)" -#. -#: build/trans_presets.java:734 -msgid "Demanding Alpine Hiking" -msgstr "Krevende alpin fjellsti" - -#. item "Ways/Demanding Alpine Hiking" -#. -#: build/trans_presets.java:738 -msgid "Edit Demanding Alpine Hiking" -msgstr "Rediger krevende alpin fjellsti" - -#. item "Ways/Demanding Alpine Hiking" text "Width (meters)" -#. -#: build/trans_presets.java:747 -msgid "Difficult Alpine Hiking" -msgstr "Vanskelig alpin fjellsti" - -#. item "Ways/Difficult Alpine Hiking" -#. -#: build/trans_presets.java:751 -msgid "Edit Difficult Alpine Hiking" -msgstr "Rediger vanskelig alpin fjellsti" - -#. item "Ways/Difficult Alpine Hiking" text "Width (meters)" -#. -#: build/trans_presets.java:761 +#: build/trans_presets.java:622 msgid "Waypoints" msgstr "Veipunkt" #. group "Waypoints" -#: build/trans_presets.java:762 +#: build/trans_presets.java:623 msgid "Motorway Junction" msgstr "Motorveikryss" @@ -19443,15 +19112,15 @@ #. item "Waypoints/Motorway Junction" #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:625 msgid "Edit Motorway Junction" msgstr "Rediger motorveikryss" #. item "Waypoints/Motorway Junction" text "Name" -#: build/trans_presets.java:768 +#: build/trans_presets.java:629 msgid "Number" msgstr "Nummer" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:770 +#: build/trans_presets.java:631 msgid "Services" msgstr "Service" @@ -19459,5 +19128,5 @@ #. item "Waypoints/Services" #. -#: build/trans_presets.java:772 +#: build/trans_presets.java:633 msgid "Edit Service Station" msgstr "Rediger Serviceområde" @@ -19496,17 +19165,17 @@ #. item "Health/Emergency Access Point" text "Point Name" #. item "Relations/Route" text "Network" -#: build/trans_presets.java:777 build/trans_presets.java:914 -#: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1426 build/trans_presets.java:1434 -#: build/trans_presets.java:1441 build/trans_presets.java:1765 -#: build/trans_presets.java:1775 build/trans_presets.java:2204 -#: build/trans_presets.java:2306 build/trans_presets.java:2336 -#: build/trans_presets.java:2388 build/trans_presets.java:2396 -#: build/trans_presets.java:2413 build/trans_presets.java:2425 -#: build/trans_presets.java:2434 build/trans_presets.java:2441 -#: build/trans_presets.java:2495 build/trans_presets.java:2505 -#: build/trans_presets.java:2557 build/trans_presets.java:2723 -#: build/trans_presets.java:2738 build/trans_presets.java:2777 -#: build/trans_presets.java:3197 +#: build/trans_presets.java:638 build/trans_presets.java:775 +#: build/trans_presets.java:1257 build/trans_presets.java:1281 +#: build/trans_presets.java:1287 build/trans_presets.java:1295 +#: build/trans_presets.java:1302 build/trans_presets.java:1626 +#: build/trans_presets.java:1636 build/trans_presets.java:2065 +#: build/trans_presets.java:2167 build/trans_presets.java:2197 +#: build/trans_presets.java:2249 build/trans_presets.java:2257 +#: build/trans_presets.java:2274 build/trans_presets.java:2286 +#: build/trans_presets.java:2295 build/trans_presets.java:2302 +#: build/trans_presets.java:2356 build/trans_presets.java:2366 +#: build/trans_presets.java:2418 build/trans_presets.java:2584 +#: build/trans_presets.java:2599 build/trans_presets.java:2638 +#: build/trans_presets.java:3058 msgid "Operator" msgstr "Operatør" @@ -19515,5 +19184,5 @@ #. #. -#: build/trans_presets.java:781 +#: build/trans_presets.java:642 msgid "Traffic Signal" msgstr "Trafikklys" @@ -19523,5 +19192,5 @@ #. #. -#: build/trans_presets.java:785 +#: build/trans_presets.java:646 msgid "Pedestrian crossing type" msgstr "Type gangfelt" @@ -19530,27 +19199,27 @@ #. item "Waypoints/Pedestrian Crossing" combo "Type" #. item "Transport/Railway/Crossing" combo "Crossing type" -#: build/trans_presets.java:785 build/trans_presets.java:800 -#: build/trans_presets.java:1344 +#: build/trans_presets.java:646 build/trans_presets.java:661 +#: build/trans_presets.java:1205 msgid "uncontrolled" msgstr "ukontrollert" -#: build/trans_presets.java:785 build/trans_presets.java:800 -#: build/trans_presets.java:1344 +#: build/trans_presets.java:646 build/trans_presets.java:661 +#: build/trans_presets.java:1205 msgid "traffic_signals" msgstr "trafikklys" -#: build/trans_presets.java:785 build/trans_presets.java:800 -#: build/trans_presets.java:1344 +#: build/trans_presets.java:646 build/trans_presets.java:661 +#: build/trans_presets.java:1205 msgid "island" msgstr "trafikkøy" -#: build/trans_presets.java:785 build/trans_presets.java:800 -#: build/trans_presets.java:1344 +#: build/trans_presets.java:646 build/trans_presets.java:661 +#: build/trans_presets.java:1205 msgid "unmarked" msgstr "umerket" #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle" -#: build/trans_presets.java:786 build/trans_presets.java:802 -#: build/trans_presets.java:1345 +#: build/trans_presets.java:647 build/trans_presets.java:663 +#: build/trans_presets.java:1206 msgid "Cross on horseback" msgstr "Kryssende ridevei" @@ -19558,6 +19227,6 @@ #. item "Waypoints/Traffic Signal" check "Cross on horseback" #. item "Transport/Railway/Crossing" check "Cross on horseback" -#: build/trans_presets.java:787 build/trans_presets.java:801 -#: build/trans_presets.java:1346 +#: build/trans_presets.java:648 build/trans_presets.java:662 +#: build/trans_presets.java:1207 msgid "Cross by bicycle" msgstr "Kryssende sykkelvei" @@ -19566,11 +19235,11 @@ #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback" #. item "Transport/Railway/Crossing" check "Cross by bicycle" -#: build/trans_presets.java:788 build/trans_presets.java:803 -#: build/trans_presets.java:1347 +#: build/trans_presets.java:649 build/trans_presets.java:664 +#: build/trans_presets.java:1208 msgid "Crossing attendant" msgstr "Betjent fotgjengerfelt" #. item "Waypoints/Traffic Signal" check "Crossing attendant" -#: build/trans_presets.java:789 +#: build/trans_presets.java:650 msgid "Crossing type name (UK)" msgstr "Crossing type name (UK)" @@ -19578,30 +19247,30 @@ #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" -#: build/trans_presets.java:789 build/trans_presets.java:804 +#: build/trans_presets.java:650 build/trans_presets.java:665 msgid "zebra" msgstr "zebra" -#: build/trans_presets.java:789 build/trans_presets.java:804 +#: build/trans_presets.java:650 build/trans_presets.java:665 msgid "pelican" msgstr "pelican" -#: build/trans_presets.java:789 build/trans_presets.java:804 +#: build/trans_presets.java:650 build/trans_presets.java:665 msgid "toucan" msgstr "toucan" -#: build/trans_presets.java:789 build/trans_presets.java:804 +#: build/trans_presets.java:650 build/trans_presets.java:665 msgid "puffin" msgstr "puffin" -#: build/trans_presets.java:789 build/trans_presets.java:804 +#: build/trans_presets.java:650 build/trans_presets.java:665 msgid "pegasus" msgstr "pegasus" -#: build/trans_presets.java:789 build/trans_presets.java:804 +#: build/trans_presets.java:650 build/trans_presets.java:665 msgid "tiger" msgstr "tiger" #. -#: build/trans_presets.java:792 +#: build/trans_presets.java:653 msgid "Stop" msgstr "Full stopp" @@ -19609,5 +19278,5 @@ #. item "Waypoints/Stop" #. -#: build/trans_presets.java:795 +#: build/trans_presets.java:656 msgid "Pedestrian Crossing" msgstr "Fotgjengerfelt" @@ -19616,14 +19285,14 @@ #. -#: build/trans_presets.java:798 +#: build/trans_presets.java:659 msgid "Edit Crossing" msgstr "Rediger fotgjengerfelt" #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant" -#: build/trans_presets.java:804 +#: build/trans_presets.java:665 msgid "Type name (UK)" msgstr "Type name (UK)" -#: build/trans_presets.java:806 +#: build/trans_presets.java:667 msgid "Mini-roundabout" msgstr "Mini-rundkjøring" @@ -19634,14 +19303,14 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" /> #. -#: build/trans_presets.java:811 +#: build/trans_presets.java:672 msgid "Direction" msgstr "Retning" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:811 +#: build/trans_presets.java:672 msgid "clockwise" msgstr "med_klokka" -#: build/trans_presets.java:813 +#: build/trans_presets.java:674 msgid "Turning Circle" msgstr "Vendesirkel" @@ -19651,20 +19320,20 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" /> #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:679 msgid "City Limit" msgstr "Bygrense" #. item "Waypoints/City Limit" -#: build/trans_presets.java:819 +#: build/trans_presets.java:680 msgid "Edit City Limit Sign" msgstr "Rediger bygrenseskilt" #. item "Waypoints/City Limit" text "Name" -#: build/trans_presets.java:824 +#: build/trans_presets.java:685 msgid "Second Name" msgstr "Annet navn" #. item "Waypoints/City Limit" text "Second Name" -#: build/trans_presets.java:826 +#: build/trans_presets.java:687 msgid "Speed Camera" msgstr "Fotoboks" @@ -19672,5 +19341,5 @@ #. item "Waypoints/Speed Camera" #. -#: build/trans_presets.java:829 +#: build/trans_presets.java:690 msgid "Emergency Phone" msgstr "Nødtelefon" @@ -19678,5 +19347,5 @@ #. item "Waypoints/Emergency Phone" #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:693 msgid "Incline" msgstr "Stigning" @@ -19684,5 +19353,5 @@ #. item "Waypoints/Incline" #. -#: build/trans_presets.java:835 +#: build/trans_presets.java:696 msgid "Incline Steep" msgstr "Sterk stigning" @@ -19691,10 +19360,10 @@ #. #. -#: build/trans_presets.java:839 +#: build/trans_presets.java:700 msgid "Ford" msgstr "Vadested" #. item "Waypoints/Ford" -#: build/trans_presets.java:840 +#: build/trans_presets.java:701 msgid "Edit Ford" msgstr "Rediger vadested" @@ -19702,5 +19371,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:847 +#: build/trans_presets.java:708 msgid "Mountain Pass" msgstr "Fjellpass" @@ -19708,5 +19377,5 @@ #. item "Waypoints/Mountain Pass" #. -#: build/trans_presets.java:849 +#: build/trans_presets.java:710 msgid "Edit Mountain Pass" msgstr "Rediger fjellpass" @@ -19718,7 +19387,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1604 -#: build/trans_presets.java:1749 build/trans_presets.java:2891 -#: build/trans_presets.java:2898 build/trans_presets.java:2905 +#: build/trans_presets.java:715 build/trans_presets.java:1465 +#: build/trans_presets.java:1610 build/trans_presets.java:2752 +#: build/trans_presets.java:2759 build/trans_presets.java:2766 msgid "Elevation" msgstr "Høyde" @@ -19726,5 +19395,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:858 +#: build/trans_presets.java:719 msgid "Barriers" msgstr "Stengsel" @@ -19732,5 +19401,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:861 +#: build/trans_presets.java:722 msgid "Bollard" msgstr "Sperresøyle" @@ -19738,5 +19407,5 @@ #. item "Barriers/Bollard" #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:724 msgid "Edit Bollard" msgstr "Rediger sperresøyle" @@ -19781,16 +19450,16 @@ #. #. -#: build/trans_presets.java:866 build/trans_presets.java:885 -#: build/trans_presets.java:899 build/trans_presets.java:921 -#: build/trans_presets.java:958 build/trans_presets.java:971 -#: build/trans_presets.java:983 build/trans_presets.java:995 -#: build/trans_presets.java:1007 build/trans_presets.java:1019 -#: build/trans_presets.java:1029 build/trans_presets.java:1038 -#: build/trans_presets.java:1047 +#: build/trans_presets.java:727 build/trans_presets.java:746 +#: build/trans_presets.java:760 build/trans_presets.java:782 +#: build/trans_presets.java:819 build/trans_presets.java:832 +#: build/trans_presets.java:844 build/trans_presets.java:856 +#: build/trans_presets.java:868 build/trans_presets.java:880 +#: build/trans_presets.java:890 build/trans_presets.java:899 +#: build/trans_presets.java:908 msgid "Allowed traffic:" msgstr "Tillatt trafikk:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:873 +#: build/trans_presets.java:734 msgid "Cycle Barrier" msgstr "Halvbommer" @@ -19799,5 +19468,5 @@ #. #. -#: build/trans_presets.java:877 +#: build/trans_presets.java:738 msgid "Block" msgstr "Steinblokk" @@ -19805,5 +19474,5 @@ #. item "Barriers/Block" #. -#: build/trans_presets.java:880 +#: build/trans_presets.java:741 msgid "Cattle Grid" msgstr "Ferist" @@ -19811,10 +19480,10 @@ #. item "Barriers/Cattle Grid" #. -#: build/trans_presets.java:882 +#: build/trans_presets.java:743 msgid "Edit Cattle Grid" msgstr "Rediger ferist" #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:892 +#: build/trans_presets.java:753 msgid "Bus Trap" msgstr "Bussluse" @@ -19822,15 +19491,15 @@ #. item "Barriers/Bus Trap" #. -#: build/trans_presets.java:895 +#: build/trans_presets.java:756 msgid "Spikes" msgstr "Pigghinder" #. item "Barriers/Spikes" -#: build/trans_presets.java:896 +#: build/trans_presets.java:757 msgid "Edit Spikes" msgstr "Rediger pigghinder" #. item "Barriers/Spikes" check "Motorcar" -#: build/trans_presets.java:907 +#: build/trans_presets.java:768 msgid "Toll Booth" msgstr "Bomstasjon" @@ -19838,5 +19507,5 @@ #. item "Barriers/Toll Booth" #. -#: build/trans_presets.java:909 +#: build/trans_presets.java:770 msgid "Edit Toll Booth" msgstr "Rediger bomstasjon" @@ -19844,10 +19513,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:917 +#: build/trans_presets.java:778 msgid "Border Control" msgstr "Tollstasjon" #. item "Barriers/Border Control" -#: build/trans_presets.java:918 +#: build/trans_presets.java:779 msgid "Edit Border Control" msgstr "Rediger tollstasjon" @@ -19855,7 +19524,7 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. -#: build/trans_presets.java:932 +#: build/trans_presets.java:793 msgid "Hedge" msgstr "Hekk" @@ -19864,5 +19533,5 @@ #. #. -#: build/trans_presets.java:936 +#: build/trans_presets.java:797 msgid "Fence" msgstr "Gjerde" @@ -19871,5 +19540,5 @@ #. #. -#: build/trans_presets.java:940 +#: build/trans_presets.java:801 msgid "Wall" msgstr "Mur" @@ -19877,5 +19546,5 @@ #. item "Barriers/Wall" #. -#: build/trans_presets.java:943 +#: build/trans_presets.java:804 msgid "City Wall" msgstr "Bymur" @@ -19884,5 +19553,5 @@ #. #. -#: build/trans_presets.java:947 +#: build/trans_presets.java:808 msgid "Retaining Wall" msgstr "Støttemur" @@ -19892,17 +19561,17 @@ #. #. -#. +#. #. -#: build/trans_presets.java:954 +#: build/trans_presets.java:815 msgid "Entrance" msgstr "Inngang" #. item "Barriers/Entrance" -#: build/trans_presets.java:955 +#: build/trans_presets.java:816 msgid "Edit Entrance" msgstr "Rediger inngang" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:966 +#: build/trans_presets.java:827 msgid "Gate" msgstr "Port" @@ -19910,50 +19579,50 @@ #. item "Barriers/Gate" #. -#: build/trans_presets.java:968 +#: build/trans_presets.java:829 msgid "Edit Gate" msgstr "Rediger port" #. item "Barriers/Gate" check "Motorcar" -#: build/trans_presets.java:979 +#: build/trans_presets.java:840 msgid "Lift Gate" msgstr "Veibom" #. item "Barriers/Lift Gate" -#: build/trans_presets.java:980 +#: build/trans_presets.java:841 msgid "Edit Lift Gate" msgstr "Rediger veibom" #. item "Barriers/Lift Gate" check "Motorcar" -#: build/trans_presets.java:991 +#: build/trans_presets.java:852 msgid "Hampshire Gate" msgstr "Gjerdestengsel" #. item "Barriers/Hampshire Gate" -#: build/trans_presets.java:992 +#: build/trans_presets.java:853 msgid "Edit Hampshire Gate" msgstr "Rediger gjerdestengsel" #. item "Barriers/Hampshire Gate" check "Motorcar" -#: build/trans_presets.java:1003 +#: build/trans_presets.java:864 msgid "Bump Gate" msgstr "Støtfangergjerde" #. item "Barriers/Bump Gate" -#: build/trans_presets.java:1004 +#: build/trans_presets.java:865 msgid "Edit Bump Gate" msgstr "Rediger støtfangergjerde" #. item "Barriers/Bump Gate" check "Motorcar" -#: build/trans_presets.java:1015 +#: build/trans_presets.java:876 msgid "Kissing Gate" msgstr "Fotgjengerport" #. item "Barriers/Kissing Gate" -#: build/trans_presets.java:1016 +#: build/trans_presets.java:877 msgid "Edit Kissing Gate" msgstr "Rediger fotgjengerport" #. item "Barriers/Kissing Gate" check "Bicycle" -#: build/trans_presets.java:1024 +#: build/trans_presets.java:885 msgid "Stile" msgstr "Gjerdetrapp" @@ -19961,40 +19630,40 @@ #. item "Barriers/Stile" #. -#: build/trans_presets.java:1026 +#: build/trans_presets.java:887 msgid "Edit Stile" msgstr "Rediger gjerdetrapp" #. item "Barriers/Stile" check "Bicycle" -#: build/trans_presets.java:1034 +#: build/trans_presets.java:895 msgid "Turnstile" msgstr "" #. item "Barriers/Turnstile" -#: build/trans_presets.java:1035 +#: build/trans_presets.java:896 msgid "Edit Turnstile" msgstr "" #. item "Barriers/Turnstile" check "Bicycle" -#: build/trans_presets.java:1043 +#: build/trans_presets.java:904 msgid "Sally Port" msgstr "Sortiport" #. item "Barriers/Sally Port" -#: build/trans_presets.java:1044 +#: build/trans_presets.java:905 msgid "Edit Sally Port" msgstr "Rediger sortiport" #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" #. -#: build/trans_presets.java:1058 build/trans_presets.java:1059 -#: build/trans_presets.java:1102 +#: build/trans_presets.java:919 build/trans_presets.java:920 +#: build/trans_presets.java:963 msgid "Water" msgstr "Vann" #. group "Water/Water" -#: build/trans_presets.java:1060 +#: build/trans_presets.java:921 msgid "Spring" msgstr "Vannkilde" @@ -20002,5 +19671,5 @@ #. item "Water/Water/Spring" #. -#: build/trans_presets.java:1062 +#: build/trans_presets.java:923 msgid "Edit Spring" msgstr "Rediger vannkilde" @@ -20008,5 +19677,5 @@ #. item "Water/Water/Spring" text "Name" #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:928 msgid "Drain" msgstr "Drenering" @@ -20014,10 +19683,10 @@ #. item "Water/Water/Drain" #. -#: build/trans_presets.java:1069 +#: build/trans_presets.java:930 msgid "Edit Drain" msgstr "Rediger drenering" #. item "Water/Water/Drain" combo "Layer" -#: build/trans_presets.java:1075 +#: build/trans_presets.java:936 msgid "Stream" msgstr "Bekk" @@ -20025,10 +19694,10 @@ #. item "Water/Water/Stream" #. -#: build/trans_presets.java:1077 +#: build/trans_presets.java:938 msgid "Edit Stream" msgstr "Rediger bekk" #. item "Water/Water/Stream" combo "Layer" -#: build/trans_presets.java:1083 +#: build/trans_presets.java:944 msgid "Canal" msgstr "Kanal" @@ -20036,10 +19705,10 @@ #. item "Water/Water/Canal" #. -#: build/trans_presets.java:1085 +#: build/trans_presets.java:946 msgid "Edit Canal" msgstr "Rediger kanal" #. item "Water/Water/Canal" combo "Layer" -#: build/trans_presets.java:1091 +#: build/trans_presets.java:952 msgid "River" msgstr "Elv" @@ -20049,5 +19718,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" /> -#: build/trans_presets.java:1095 +#: build/trans_presets.java:956 msgid "Edit River" msgstr "Rediger elv" @@ -20055,15 +19724,15 @@ #. item "Water/Water/Water" #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:965 msgid "Edit Water" msgstr "Rediger vann" #. item "Water/Water/Water" text "Name" -#: build/trans_presets.java:1108 +#: build/trans_presets.java:969 msgid "Land" msgstr "Land" #. item "Water/Water/Land" -#: build/trans_presets.java:1109 +#: build/trans_presets.java:970 msgid "Edit Land" msgstr "Rediger land" @@ -20071,15 +19740,15 @@ #. item "Water/Water/Land" text "Name" #. -#: build/trans_presets.java:1114 +#: build/trans_presets.java:975 msgid "Basin" msgstr "Basseng" #. item "Water/Water/Basin" -#: build/trans_presets.java:1115 +#: build/trans_presets.java:976 msgid "Edit Basin Landuse" msgstr "Rediger basseng" #. item "Water/Water/Basin" text "Name" -#: build/trans_presets.java:1120 +#: build/trans_presets.java:981 msgid "Reservoir" msgstr "Drikkevannskilde" @@ -20087,15 +19756,15 @@ #. item "Water/Water/Reservoir" #. -#: build/trans_presets.java:1122 +#: build/trans_presets.java:983 msgid "Edit Reservoir Landuse" msgstr "Rediger drikkevannskilde" #. item "Water/Water/Reservoir" text "Name" -#: build/trans_presets.java:1127 +#: build/trans_presets.java:988 msgid "Covered Reservoir" msgstr "Tildekt drikkevannskilde" #. item "Water/Water/Covered Reservoir" -#: build/trans_presets.java:1128 +#: build/trans_presets.java:989 msgid "Edit Covered Reservoir" msgstr "Rediger tildekt drikkevannskilde" @@ -20103,5 +19772,5 @@ #. item "Water/Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1133 +#: build/trans_presets.java:994 msgid "Riverbank" msgstr "Elvebredd" @@ -20110,10 +19779,10 @@ #. -#: build/trans_presets.java:1136 +#: build/trans_presets.java:997 msgid "Edit Riverbank" msgstr "Rediger elvebredd" #. item "Water/Water/Riverbank" text "Name" -#: build/trans_presets.java:1140 +#: build/trans_presets.java:1001 msgid "Wetland" msgstr "Våtmarksområde" @@ -20124,14 +19793,14 @@ #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland" #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" /> -#: build/trans_presets.java:1145 +#: build/trans_presets.java:1006 msgid "Edit Wetland" msgstr "Rediger våtmarksområde" #. item "Water/Water/Wetland" combo "Type" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1009 msgid "swamp" msgstr "Sumpområde" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1009 msgid "bog" msgstr "Flytemyr" @@ -20141,39 +19810,39 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3453 +#: build/trans_presets.java:1009 build/trans_style.java:3484 msgid "marsh" msgstr "Myrområde" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1009 msgid "reedbed" msgstr "Sivområde" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1009 msgid "saltmarsh" msgstr "Saltmyr" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1009 msgid "tidalflat" msgstr "Tidevannsflate" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1009 msgid "mangrove" msgstr "Mangrove" -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1011 msgid "Mud" msgstr "Gjørme" #. item "Water/Water/Mud" -#: build/trans_presets.java:1151 +#: build/trans_presets.java:1012 msgid "Edit Mud" msgstr "Rediger gjørme" #. item "Water/Water/Mud" text "Name" -#: build/trans_presets.java:1155 +#: build/trans_presets.java:1016 msgid "Beach" msgstr "Strand" @@ -20181,20 +19850,20 @@ #. item "Water/Water/Beach" #. -#: build/trans_presets.java:1157 +#: build/trans_presets.java:1018 msgid "Edit Beach" msgstr "Rediger strand" #. item "Water/Water/Beach" text "Name" -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1022 msgid "Bay" msgstr "Havbukt" #. item "Water/Water/Bay" -#: build/trans_presets.java:1162 +#: build/trans_presets.java:1023 msgid "Edit Bay" msgstr "Rediger havbukt" #. item "Water/Water/Bay" text "Name" -#: build/trans_presets.java:1166 +#: build/trans_presets.java:1027 msgid "Cliff" msgstr "Klippe" @@ -20202,10 +19871,10 @@ #. item "Water/Water/Cliff" #. -#: build/trans_presets.java:1168 +#: build/trans_presets.java:1029 msgid "Edit Cliff" msgstr "Rediger klippe" #. item "Water/Water/Cliff" text "Name" -#: build/trans_presets.java:1172 +#: build/trans_presets.java:1033 msgid "Coastline" msgstr "Kystlinje" @@ -20213,5 +19882,5 @@ #. item "Water/Water/Coastline" #. -#: build/trans_presets.java:1174 +#: build/trans_presets.java:1035 msgid "Edit Coastline" msgstr "Rediger kystlinje" @@ -20219,5 +19888,5 @@ #. item "Water/Water/Coastline" text "Name" #. -#: build/trans_presets.java:1179 +#: build/trans_presets.java:1040 msgid "Ferry Route" msgstr "Fergerute" @@ -20225,5 +19894,5 @@ #. item "Water/Water/Ferry Route" #. -#: build/trans_presets.java:1181 +#: build/trans_presets.java:1042 msgid "Edit Ferry" msgstr "Rediger fergerute" @@ -20232,5 +19901,5 @@ #. #. -#: build/trans_presets.java:1189 +#: build/trans_presets.java:1050 msgid "Boatyard" msgstr "Skipsverft" @@ -20238,10 +19907,10 @@ #. item "Water/Water/Boatyard" #. -#: build/trans_presets.java:1191 +#: build/trans_presets.java:1052 msgid "Edit Boatyard" msgstr "Rediger skipsverft" #. item "Water/Water/Boatyard" text "Name" -#: build/trans_presets.java:1196 +#: build/trans_presets.java:1057 msgid "Dock" msgstr "Tørrdokk" @@ -20249,5 +19918,5 @@ #. item "Water/Water/Dock" #. -#: build/trans_presets.java:1198 +#: build/trans_presets.java:1059 msgid "Edit Dock" msgstr "Rediger tørrdokk" @@ -20255,5 +19924,5 @@ #. item "Water/Water/Dock" text "Name" #. -#: build/trans_presets.java:1204 +#: build/trans_presets.java:1065 msgid "Dam" msgstr "Demning" @@ -20261,15 +19930,15 @@ #. item "Water/Water/Dam" #. -#: build/trans_presets.java:1206 +#: build/trans_presets.java:1067 msgid "Edit Dam" msgstr "Rediger demning" #. item "Water/Water/Dam" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1073 msgid "Waterway Point" msgstr "Punkt i vann" #. group "Waterway Point" -#: build/trans_presets.java:1213 +#: build/trans_presets.java:1074 msgid "Lock Gate" msgstr "Sluseport" @@ -20278,5 +19947,5 @@ #. #. -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1078 msgid "Weir" msgstr "Terskeldam" @@ -20284,20 +19953,20 @@ #. item "Waterway Point/Weir" #. -#: build/trans_presets.java:1219 +#: build/trans_presets.java:1080 msgid "Edit Weir" msgstr "Rediger terskeldam" #. item "Waterway Point/Weir" text "Name" -#: build/trans_presets.java:1224 +#: build/trans_presets.java:1085 msgid "Waterfall" msgstr "Foss" #. item "Waterway Point/Waterfall" -#: build/trans_presets.java:1225 +#: build/trans_presets.java:1086 msgid "Edit Waterfall" msgstr "Rediger foss" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1230 +#: build/trans_presets.java:1091 msgid "Turning Point" msgstr "Snuplass" @@ -20306,15 +19975,15 @@ #. #. -#: build/trans_presets.java:1234 +#: build/trans_presets.java:1095 msgid "Marina" msgstr "Marina" #. item "Waterway Point/Marina" -#: build/trans_presets.java:1235 +#: build/trans_presets.java:1096 msgid "Edit Marina" msgstr "Rediger marina" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1239 +#: build/trans_presets.java:1100 msgid "Pier" msgstr "Brygge" @@ -20322,10 +19991,10 @@ #. item "Waterway Point/Pier" #. -#: build/trans_presets.java:1241 +#: build/trans_presets.java:1102 msgid "Edit Pier" msgstr "Rediger brygge" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1245 +#: build/trans_presets.java:1106 msgid "Ferry Terminal" msgstr "Fergeleie" @@ -20333,10 +20002,10 @@ #. item "Waterway Point/Ferry Terminal" #. -#: build/trans_presets.java:1247 +#: build/trans_presets.java:1108 msgid "Edit Ferry Terminal" msgstr "Rediger fergeleie" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1251 +#: build/trans_presets.java:1112 msgid "Slipway" msgstr "Båtslipp" @@ -20346,20 +20015,20 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" /> -#: build/trans_presets.java:1255 +#: build/trans_presets.java:1116 msgid "Edit Slipway" msgstr "Rediger båtslipp" #. item "Waterway Point/Slipway" text "Name" -#: build/trans_presets.java:1261 +#: build/trans_presets.java:1122 msgid "Transport" msgstr "" #. group "Transport" -#: build/trans_presets.java:1262 +#: build/trans_presets.java:1123 msgid "Railway" msgstr "Jernbane" #. group "Transport/Railway" -#: build/trans_presets.java:1263 +#: build/trans_presets.java:1124 msgid "Rail" msgstr "Jernbane" @@ -20367,5 +20036,5 @@ #. item "Transport/Railway/Rail" #. -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1126 msgid "Edit Rail" msgstr "Rediger jernbane" @@ -20395,8 +20064,8 @@ #. #. -#: build/trans_presets.java:1268 build/trans_presets.java:1274 -#: build/trans_presets.java:1281 build/trans_presets.java:1287 -#: build/trans_presets.java:1293 build/trans_presets.java:1299 -#: build/trans_presets.java:1305 build/trans_presets.java:1330 +#: build/trans_presets.java:1129 build/trans_presets.java:1135 +#: build/trans_presets.java:1142 build/trans_presets.java:1148 +#: build/trans_presets.java:1154 build/trans_presets.java:1160 +#: build/trans_presets.java:1166 build/trans_presets.java:1191 msgid "Optional Types" msgstr "Alternative typer" @@ -20410,35 +20079,35 @@ #. item "Transport/Railway/Tram" combo "Optional Types" #. item "Transport/Railway/Disused Rail" combo "Optional Types" -#: build/trans_presets.java:1268 build/trans_presets.java:1274 -#: build/trans_presets.java:1281 build/trans_presets.java:1287 -#: build/trans_presets.java:1293 build/trans_presets.java:1299 -#: build/trans_presets.java:1305 build/trans_presets.java:1330 +#: build/trans_presets.java:1129 build/trans_presets.java:1135 +#: build/trans_presets.java:1142 build/trans_presets.java:1148 +#: build/trans_presets.java:1154 build/trans_presets.java:1160 +#: build/trans_presets.java:1166 build/trans_presets.java:1191 msgid "yard" msgstr "Stasjonsområde" -#: build/trans_presets.java:1268 build/trans_presets.java:1274 -#: build/trans_presets.java:1281 build/trans_presets.java:1287 -#: build/trans_presets.java:1293 build/trans_presets.java:1299 -#: build/trans_presets.java:1305 build/trans_presets.java:1330 +#: build/trans_presets.java:1129 build/trans_presets.java:1135 +#: build/trans_presets.java:1142 build/trans_presets.java:1148 +#: build/trans_presets.java:1154 build/trans_presets.java:1160 +#: build/trans_presets.java:1166 build/trans_presets.java:1191 msgid "siding" msgstr "Sidespor" -#: build/trans_presets.java:1268 build/trans_presets.java:1274 -#: build/trans_presets.java:1281 build/trans_presets.java:1287 -#: build/trans_presets.java:1293 build/trans_presets.java:1299 -#: build/trans_presets.java:1305 build/trans_presets.java:1330 +#: build/trans_presets.java:1129 build/trans_presets.java:1135 +#: build/trans_presets.java:1142 build/trans_presets.java:1148 +#: build/trans_presets.java:1154 build/trans_presets.java:1160 +#: build/trans_presets.java:1166 build/trans_presets.java:1191 msgid "spur" msgstr "Privat sidespor" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1131 msgid "Narrow Gauge Rail" msgstr "Smal jernbane" #. item "Transport/Railway/Narrow Gauge Rail" -#: build/trans_presets.java:1271 +#: build/trans_presets.java:1132 msgid "Edit Narrow Gauge Rail" msgstr "Rediger smal jernbane" -#: build/trans_presets.java:1276 +#: build/trans_presets.java:1137 msgid "Monorail" msgstr "Monorail" @@ -20446,45 +20115,45 @@ #. item "Transport/Railway/Monorail" #. -#: build/trans_presets.java:1278 +#: build/trans_presets.java:1139 msgid "Edit Monorail" msgstr "Rediger Monorail" -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1144 msgid "Preserved" msgstr "Fredet bane" #. item "Transport/Railway/Preserved" -#: build/trans_presets.java:1284 +#: build/trans_presets.java:1145 msgid "Edit Preserved Railway" msgstr "Rediger fredet bane" -#: build/trans_presets.java:1289 +#: build/trans_presets.java:1150 msgid "Light Rail" msgstr "Bybane" #. item "Transport/Railway/Light Rail" -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1151 msgid "Edit Light Rail" msgstr "Rediger bybane" -#: build/trans_presets.java:1295 +#: build/trans_presets.java:1156 msgid "Subway" msgstr "T-bane" #. item "Transport/Railway/Subway" -#: build/trans_presets.java:1296 +#: build/trans_presets.java:1157 msgid "Edit Subway" msgstr "Rediger T-bane" -#: build/trans_presets.java:1301 +#: build/trans_presets.java:1162 msgid "Tram" msgstr "Trikk" #. item "Transport/Railway/Tram" -#: build/trans_presets.java:1302 +#: build/trans_presets.java:1163 msgid "Edit Tram" msgstr "Rediger trikk" -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1168 msgid "Bus Guideway" msgstr "Busspor" @@ -20492,5 +20161,5 @@ #. item "Transport/Railway/Bus Guideway" #. -#: build/trans_presets.java:1309 +#: build/trans_presets.java:1170 msgid "Edit Bus Guideway" msgstr "Rediger busspor" @@ -20499,14 +20168,14 @@ #. #. -#: build/trans_presets.java:1326 +#: build/trans_presets.java:1187 msgid "Disused Rail" msgstr "Nedlagt jernbane" #. item "Transport/Railway/Disused Rail" -#: build/trans_presets.java:1327 +#: build/trans_presets.java:1188 msgid "Edit Disused Railway" msgstr "Rediger nedlagt jernbane" -#: build/trans_presets.java:1332 +#: build/trans_presets.java:1193 msgid "Abandoned Rail" msgstr "Revet jernbane" @@ -20515,5 +20184,5 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1197 msgid "Level Crossing" msgstr "Planovergang" @@ -20522,5 +20191,5 @@ #. #. -#: build/trans_presets.java:1340 +#: build/trans_presets.java:1201 msgid "Crossing" msgstr "Fotgjengerfelt" @@ -20530,5 +20199,5 @@ #. #. -#: build/trans_presets.java:1344 +#: build/trans_presets.java:1205 msgid "Crossing type" msgstr "Type fotgjengerfelt" @@ -20536,5 +20205,5 @@ #. item "Transport/Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1350 +#: build/trans_presets.java:1211 msgid "Turntable" msgstr "Dreieskive" @@ -20543,10 +20212,10 @@ #. #. -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1216 msgid "Aerialway" msgstr "Taubaner og -heiser" #. group "Aerialway" -#: build/trans_presets.java:1356 +#: build/trans_presets.java:1217 msgid "Chair Lift" msgstr "Stolheis" @@ -20554,10 +20223,10 @@ #. item "Aerialway/Chair Lift" #. -#: build/trans_presets.java:1358 +#: build/trans_presets.java:1219 msgid "Edit Chair Lift" msgstr "Rediger stolheis" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1362 +#: build/trans_presets.java:1223 msgid "Drag Lift" msgstr "T-krokheis" @@ -20565,10 +20234,10 @@ #. item "Aerialway/Drag Lift" #. -#: build/trans_presets.java:1364 +#: build/trans_presets.java:1225 msgid "Edit Drag Lift" msgstr "Rediger T-krokheis" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1368 +#: build/trans_presets.java:1229 msgid "Cable Car" msgstr "Taubane" @@ -20576,10 +20245,10 @@ #. item "Aerialway/Cable Car" #. -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1231 msgid "Edit Cable Car" msgstr "Rediger taubane" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1374 +#: build/trans_presets.java:1235 msgid "Gondola" msgstr "Gondolbane" @@ -20587,10 +20256,10 @@ #. item "Aerialway/Gondola" #. -#: build/trans_presets.java:1376 +#: build/trans_presets.java:1237 msgid "Edit Gondola" msgstr "Rediger gondolbane" #. item "Aerialway/Gondola" text "Name" -#: build/trans_presets.java:1380 +#: build/trans_presets.java:1241 msgctxt "aerialway" msgid "Station" @@ -20599,5 +20268,5 @@ #. item "Aerialway/Station" #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1243 msgctxt "aerialway" msgid "Edit Station" @@ -20605,5 +20274,5 @@ #. group "Car" -#: build/trans_presets.java:1389 +#: build/trans_presets.java:1250 msgid "Fuel" msgstr "Bensinstasjon" @@ -20613,5 +20282,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" /> -#: build/trans_presets.java:1393 +#: build/trans_presets.java:1254 msgid "Edit Fuel" msgstr "Rediger bensinstasjon" @@ -20669,32 +20338,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1625 -#: build/trans_presets.java:1633 build/trans_presets.java:1640 -#: build/trans_presets.java:1647 build/trans_presets.java:1653 -#: build/trans_presets.java:1660 build/trans_presets.java:1667 -#: build/trans_presets.java:1675 build/trans_presets.java:1682 -#: build/trans_presets.java:1690 build/trans_presets.java:1703 -#: build/trans_presets.java:1717 build/trans_presets.java:1814 -#: build/trans_presets.java:1822 build/trans_presets.java:1925 -#: build/trans_presets.java:1931 build/trans_presets.java:2244 -#: build/trans_presets.java:2268 build/trans_presets.java:2496 -#: build/trans_presets.java:2518 build/trans_presets.java:2524 -#: build/trans_presets.java:2531 build/trans_presets.java:2538 -#: build/trans_presets.java:2544 build/trans_presets.java:2550 -#: build/trans_presets.java:2572 build/trans_presets.java:2579 -#: build/trans_presets.java:2586 build/trans_presets.java:2592 -#: build/trans_presets.java:2599 build/trans_presets.java:2605 -#: build/trans_presets.java:2611 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 -#: build/trans_presets.java:2636 build/trans_presets.java:2643 -#: build/trans_presets.java:2650 build/trans_presets.java:2656 -#: build/trans_presets.java:2662 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 -#: build/trans_presets.java:2687 build/trans_presets.java:2694 -#: build/trans_presets.java:2701 build/trans_presets.java:2707 -#: build/trans_presets.java:2713 build/trans_presets.java:2724 -#: build/trans_presets.java:2732 build/trans_presets.java:2747 -#: build/trans_presets.java:2753 build/trans_presets.java:2761 -#: build/trans_presets.java:2788 +#: build/trans_presets.java:1258 build/trans_presets.java:1486 +#: build/trans_presets.java:1494 build/trans_presets.java:1501 +#: build/trans_presets.java:1508 build/trans_presets.java:1514 +#: build/trans_presets.java:1521 build/trans_presets.java:1528 +#: build/trans_presets.java:1536 build/trans_presets.java:1543 +#: build/trans_presets.java:1551 build/trans_presets.java:1564 +#: build/trans_presets.java:1578 build/trans_presets.java:1675 +#: build/trans_presets.java:1683 build/trans_presets.java:1786 +#: build/trans_presets.java:1792 build/trans_presets.java:2105 +#: build/trans_presets.java:2129 build/trans_presets.java:2357 +#: build/trans_presets.java:2379 build/trans_presets.java:2385 +#: build/trans_presets.java:2392 build/trans_presets.java:2399 +#: build/trans_presets.java:2405 build/trans_presets.java:2411 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2447 build/trans_presets.java:2453 +#: build/trans_presets.java:2460 build/trans_presets.java:2466 +#: build/trans_presets.java:2472 build/trans_presets.java:2478 +#: build/trans_presets.java:2484 build/trans_presets.java:2490 +#: build/trans_presets.java:2497 build/trans_presets.java:2504 +#: build/trans_presets.java:2511 build/trans_presets.java:2517 +#: build/trans_presets.java:2523 build/trans_presets.java:2529 +#: build/trans_presets.java:2535 build/trans_presets.java:2541 +#: build/trans_presets.java:2548 build/trans_presets.java:2555 +#: build/trans_presets.java:2562 build/trans_presets.java:2568 +#: build/trans_presets.java:2574 build/trans_presets.java:2585 +#: build/trans_presets.java:2593 build/trans_presets.java:2608 +#: build/trans_presets.java:2614 build/trans_presets.java:2622 +#: build/trans_presets.java:2649 msgid "Opening Hours" msgstr "Åpningstider" @@ -20753,91 +20422,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1625 -#: build/trans_presets.java:1633 build/trans_presets.java:1640 -#: build/trans_presets.java:1647 build/trans_presets.java:1653 -#: build/trans_presets.java:1660 build/trans_presets.java:1667 -#: build/trans_presets.java:1682 build/trans_presets.java:1690 -#: build/trans_presets.java:1703 build/trans_presets.java:1717 -#: build/trans_presets.java:1814 build/trans_presets.java:1822 -#: build/trans_presets.java:1925 build/trans_presets.java:1931 -#: build/trans_presets.java:2244 build/trans_presets.java:2268 -#: build/trans_presets.java:2518 build/trans_presets.java:2524 -#: build/trans_presets.java:2531 build/trans_presets.java:2538 -#: build/trans_presets.java:2544 build/trans_presets.java:2550 -#: build/trans_presets.java:2572 build/trans_presets.java:2579 -#: build/trans_presets.java:2586 build/trans_presets.java:2592 -#: build/trans_presets.java:2599 build/trans_presets.java:2605 -#: build/trans_presets.java:2611 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 -#: build/trans_presets.java:2636 build/trans_presets.java:2643 -#: build/trans_presets.java:2650 build/trans_presets.java:2656 -#: build/trans_presets.java:2662 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 -#: build/trans_presets.java:2687 build/trans_presets.java:2694 -#: build/trans_presets.java:2701 build/trans_presets.java:2707 -#: build/trans_presets.java:2713 build/trans_presets.java:2724 -#: build/trans_presets.java:2732 build/trans_presets.java:2747 -#: build/trans_presets.java:2753 build/trans_presets.java:2761 -#: build/trans_presets.java:2788 +#: build/trans_presets.java:1258 build/trans_presets.java:1486 +#: build/trans_presets.java:1494 build/trans_presets.java:1501 +#: build/trans_presets.java:1508 build/trans_presets.java:1514 +#: build/trans_presets.java:1521 build/trans_presets.java:1528 +#: build/trans_presets.java:1543 build/trans_presets.java:1551 +#: build/trans_presets.java:1564 build/trans_presets.java:1578 +#: build/trans_presets.java:1675 build/trans_presets.java:1683 +#: build/trans_presets.java:1786 build/trans_presets.java:1792 +#: build/trans_presets.java:2105 build/trans_presets.java:2129 +#: build/trans_presets.java:2379 build/trans_presets.java:2385 +#: build/trans_presets.java:2392 build/trans_presets.java:2399 +#: build/trans_presets.java:2405 build/trans_presets.java:2411 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2447 build/trans_presets.java:2453 +#: build/trans_presets.java:2460 build/trans_presets.java:2466 +#: build/trans_presets.java:2472 build/trans_presets.java:2478 +#: build/trans_presets.java:2484 build/trans_presets.java:2490 +#: build/trans_presets.java:2497 build/trans_presets.java:2504 +#: build/trans_presets.java:2511 build/trans_presets.java:2517 +#: build/trans_presets.java:2523 build/trans_presets.java:2529 +#: build/trans_presets.java:2535 build/trans_presets.java:2541 +#: build/trans_presets.java:2548 build/trans_presets.java:2555 +#: build/trans_presets.java:2562 build/trans_presets.java:2568 +#: build/trans_presets.java:2574 build/trans_presets.java:2585 +#: build/trans_presets.java:2593 build/trans_presets.java:2608 +#: build/trans_presets.java:2614 build/trans_presets.java:2622 +#: build/trans_presets.java:2649 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1625 -#: build/trans_presets.java:1633 build/trans_presets.java:1640 -#: build/trans_presets.java:1647 build/trans_presets.java:1653 -#: build/trans_presets.java:1660 build/trans_presets.java:1667 -#: build/trans_presets.java:1682 build/trans_presets.java:1690 -#: build/trans_presets.java:1703 build/trans_presets.java:1717 -#: build/trans_presets.java:1814 build/trans_presets.java:1822 -#: build/trans_presets.java:1925 build/trans_presets.java:1931 -#: build/trans_presets.java:2244 build/trans_presets.java:2268 -#: build/trans_presets.java:2518 build/trans_presets.java:2524 -#: build/trans_presets.java:2531 build/trans_presets.java:2538 -#: build/trans_presets.java:2544 build/trans_presets.java:2550 -#: build/trans_presets.java:2572 build/trans_presets.java:2579 -#: build/trans_presets.java:2586 build/trans_presets.java:2592 -#: build/trans_presets.java:2599 build/trans_presets.java:2605 -#: build/trans_presets.java:2611 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 -#: build/trans_presets.java:2636 build/trans_presets.java:2643 -#: build/trans_presets.java:2650 build/trans_presets.java:2656 -#: build/trans_presets.java:2662 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 -#: build/trans_presets.java:2687 build/trans_presets.java:2694 -#: build/trans_presets.java:2701 build/trans_presets.java:2707 -#: build/trans_presets.java:2713 build/trans_presets.java:2724 -#: build/trans_presets.java:2732 build/trans_presets.java:2747 -#: build/trans_presets.java:2753 build/trans_presets.java:2761 -#: build/trans_presets.java:2788 +#: build/trans_presets.java:1258 build/trans_presets.java:1486 +#: build/trans_presets.java:1494 build/trans_presets.java:1501 +#: build/trans_presets.java:1508 build/trans_presets.java:1514 +#: build/trans_presets.java:1521 build/trans_presets.java:1528 +#: build/trans_presets.java:1543 build/trans_presets.java:1551 +#: build/trans_presets.java:1564 build/trans_presets.java:1578 +#: build/trans_presets.java:1675 build/trans_presets.java:1683 +#: build/trans_presets.java:1786 build/trans_presets.java:1792 +#: build/trans_presets.java:2105 build/trans_presets.java:2129 +#: build/trans_presets.java:2379 build/trans_presets.java:2385 +#: build/trans_presets.java:2392 build/trans_presets.java:2399 +#: build/trans_presets.java:2405 build/trans_presets.java:2411 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2447 build/trans_presets.java:2453 +#: build/trans_presets.java:2460 build/trans_presets.java:2466 +#: build/trans_presets.java:2472 build/trans_presets.java:2478 +#: build/trans_presets.java:2484 build/trans_presets.java:2490 +#: build/trans_presets.java:2497 build/trans_presets.java:2504 +#: build/trans_presets.java:2511 build/trans_presets.java:2517 +#: build/trans_presets.java:2523 build/trans_presets.java:2529 +#: build/trans_presets.java:2535 build/trans_presets.java:2541 +#: build/trans_presets.java:2548 build/trans_presets.java:2555 +#: build/trans_presets.java:2562 build/trans_presets.java:2568 +#: build/trans_presets.java:2574 build/trans_presets.java:2585 +#: build/trans_presets.java:2593 build/trans_presets.java:2608 +#: build/trans_presets.java:2614 build/trans_presets.java:2622 +#: build/trans_presets.java:2649 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1625 -#: build/trans_presets.java:1633 build/trans_presets.java:1640 -#: build/trans_presets.java:1647 build/trans_presets.java:1653 -#: build/trans_presets.java:1660 build/trans_presets.java:1667 -#: build/trans_presets.java:1682 build/trans_presets.java:1690 -#: build/trans_presets.java:1703 build/trans_presets.java:1717 -#: build/trans_presets.java:1814 build/trans_presets.java:1822 -#: build/trans_presets.java:1925 build/trans_presets.java:1931 -#: build/trans_presets.java:2244 build/trans_presets.java:2268 -#: build/trans_presets.java:2518 build/trans_presets.java:2524 -#: build/trans_presets.java:2531 build/trans_presets.java:2538 -#: build/trans_presets.java:2544 build/trans_presets.java:2550 -#: build/trans_presets.java:2572 build/trans_presets.java:2579 -#: build/trans_presets.java:2586 build/trans_presets.java:2592 -#: build/trans_presets.java:2599 build/trans_presets.java:2605 -#: build/trans_presets.java:2611 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 -#: build/trans_presets.java:2636 build/trans_presets.java:2643 -#: build/trans_presets.java:2650 build/trans_presets.java:2656 -#: build/trans_presets.java:2662 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 -#: build/trans_presets.java:2687 build/trans_presets.java:2694 -#: build/trans_presets.java:2701 build/trans_presets.java:2707 -#: build/trans_presets.java:2713 build/trans_presets.java:2724 -#: build/trans_presets.java:2732 build/trans_presets.java:2747 -#: build/trans_presets.java:2753 build/trans_presets.java:2761 -#: build/trans_presets.java:2788 +#: build/trans_presets.java:1258 build/trans_presets.java:1486 +#: build/trans_presets.java:1494 build/trans_presets.java:1501 +#: build/trans_presets.java:1508 build/trans_presets.java:1514 +#: build/trans_presets.java:1521 build/trans_presets.java:1528 +#: build/trans_presets.java:1543 build/trans_presets.java:1551 +#: build/trans_presets.java:1564 build/trans_presets.java:1578 +#: build/trans_presets.java:1675 build/trans_presets.java:1683 +#: build/trans_presets.java:1786 build/trans_presets.java:1792 +#: build/trans_presets.java:2105 build/trans_presets.java:2129 +#: build/trans_presets.java:2379 build/trans_presets.java:2385 +#: build/trans_presets.java:2392 build/trans_presets.java:2399 +#: build/trans_presets.java:2405 build/trans_presets.java:2411 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2447 build/trans_presets.java:2453 +#: build/trans_presets.java:2460 build/trans_presets.java:2466 +#: build/trans_presets.java:2472 build/trans_presets.java:2478 +#: build/trans_presets.java:2484 build/trans_presets.java:2490 +#: build/trans_presets.java:2497 build/trans_presets.java:2504 +#: build/trans_presets.java:2511 build/trans_presets.java:2517 +#: build/trans_presets.java:2523 build/trans_presets.java:2529 +#: build/trans_presets.java:2535 build/trans_presets.java:2541 +#: build/trans_presets.java:2548 build/trans_presets.java:2555 +#: build/trans_presets.java:2562 build/trans_presets.java:2568 +#: build/trans_presets.java:2574 build/trans_presets.java:2585 +#: build/trans_presets.java:2593 build/trans_presets.java:2608 +#: build/trans_presets.java:2614 build/trans_presets.java:2622 +#: build/trans_presets.java:2649 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -20852,5 +20521,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1445 +#: build/trans_presets.java:1260 build/trans_presets.java:1306 #: build/trans_surveyor.java:24 msgid "Parking" @@ -20860,5 +20529,5 @@ #. -#: build/trans_presets.java:1402 +#: build/trans_presets.java:1263 msgid "Edit Parking" msgstr "Rediger parkering" @@ -20869,25 +20538,25 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1766 -#: build/trans_presets.java:1776 build/trans_presets.java:2426 -#: build/trans_presets.java:2558 +#: build/trans_presets.java:1266 build/trans_presets.java:1627 +#: build/trans_presets.java:1637 build/trans_presets.java:2287 +#: build/trans_presets.java:2419 msgid "Reference number" msgstr "Referansenummer" #. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1406 +#: build/trans_presets.java:1267 msgid "multi-storey" msgstr "P-hus" -#: build/trans_presets.java:1406 +#: build/trans_presets.java:1267 msgid "surface" msgstr "Overflateparkering" #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2338 +#: build/trans_presets.java:1267 build/trans_presets.java:2199 msgid "underground" msgstr "P-kjeller" -#: build/trans_presets.java:1407 +#: build/trans_presets.java:1268 msgid "Park and Ride" msgstr "" @@ -20896,48 +20565,48 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1767 -#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:1269 build/trans_presets.java:1628 +#: build/trans_presets.java:1638 build/trans_presets.java:2288 msgid "Fee" msgstr "Gebyr" #. -#: build/trans_presets.java:1410 +#: build/trans_presets.java:1271 msgid "Capacity (overall)" msgstr "" #. item "Car/Parking" text "Capacity (overall)" -#: build/trans_presets.java:1411 +#: build/trans_presets.java:1272 msgid "Spaces for Disabled" msgstr "Handicap-plasser" -#: build/trans_presets.java:1412 +#: build/trans_presets.java:1273 msgid "Spaces for Women" msgstr "" -#: build/trans_presets.java:1413 +#: build/trans_presets.java:1274 msgid "Spaces for Parents" msgstr "" -#: build/trans_presets.java:1414 +#: build/trans_presets.java:1275 msgid "See the Wiki for other capacity:[types]=*." msgstr "" #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*." -#: build/trans_presets.java:1416 +#: build/trans_presets.java:1277 msgid "Wash" msgstr "Bilvask" #. item "Car/Wash" -#: build/trans_presets.java:1417 +#: build/trans_presets.java:1278 msgid "Edit Car Wash" msgstr "Rediger bilvask" #. item "Car/Wash" text "Operator" -#: build/trans_presets.java:1422 +#: build/trans_presets.java:1283 msgid "Repair" msgstr "Verksted" #. item "Car/Repair" -#: build/trans_presets.java:1423 +#: build/trans_presets.java:1284 msgid "Edit Car Repair" msgstr "Rediger verksted" @@ -20945,5 +20614,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1428 build/trans_presets.java:1452 +#: build/trans_presets.java:1289 build/trans_presets.java:1313 msgid "Rental" msgstr "Bilutleie" @@ -20952,10 +20621,10 @@ #. -#: build/trans_presets.java:1431 +#: build/trans_presets.java:1292 msgid "Edit Car Rental" msgstr "Rediger bilutleie" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1297 msgid "Sharing" msgstr "Bildeling" @@ -20963,5 +20632,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1299 msgid "Edit Car Sharing" msgstr "Rediger bildeling" @@ -20969,10 +20638,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1447 +#: build/trans_presets.java:1308 msgid "Edit Bicycle Parking" msgstr "Rediger sykkelparkering" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1450 +#: build/trans_presets.java:1311 msgid "Capacity" msgstr "Kapasitet" @@ -20981,15 +20650,15 @@ #. -#: build/trans_presets.java:1455 +#: build/trans_presets.java:1316 msgid "Edit Bicycle Rental" msgstr "Rediger sykkelutleie" #. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1321 msgid "Public Transport" msgstr "Offentlig transport" #. group "Public Transport" -#: build/trans_presets.java:1461 +#: build/trans_presets.java:1322 msgctxt "railway" msgid "Station" @@ -20999,5 +20668,5 @@ #. -#: build/trans_presets.java:1464 +#: build/trans_presets.java:1325 msgctxt "railway" msgid "Edit Station" @@ -21005,5 +20674,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1330 msgid "UIC-Reference" msgstr "Internasjonal UIC-jernbanekode" @@ -21011,5 +20680,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1333 msgid "Railway Halt" msgstr "Jernbanestopp" @@ -21017,5 +20686,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1474 +#: build/trans_presets.java:1335 msgid "Edit Halt" msgstr "Rediger jernbanestopp" @@ -21023,5 +20692,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1481 +#: build/trans_presets.java:1342 msgid "Tram Stop" msgstr "Trikkestopp" @@ -21030,5 +20699,5 @@ #. -#: build/trans_presets.java:1484 +#: build/trans_presets.java:1345 msgid "Edit Tram Stop" msgstr "Rediger trikkestopp" @@ -21036,5 +20705,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1491 +#: build/trans_presets.java:1352 msgid "Railway Platform" msgstr "Jernbaneplattform" @@ -21043,5 +20712,5 @@ #. -#: build/trans_presets.java:1494 +#: build/trans_presets.java:1355 msgid "Edit Railway Platform" msgstr "Rediger jernbaneplattform" @@ -21053,5 +20722,5 @@ #. #. -#: build/trans_presets.java:1497 build/trans_presets.java:1542 +#: build/trans_presets.java:1358 build/trans_presets.java:1403 msgid "Reference (track number)" msgstr "Spornummer" @@ -21059,10 +20728,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1499 build/trans_presets.java:1544 +#: build/trans_presets.java:1360 build/trans_presets.java:1405 msgid "Area" msgstr "Område" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1501 +#: build/trans_presets.java:1362 msgid "Subway Entrance" msgstr "T-baneinngang" @@ -21071,10 +20740,10 @@ #. -#: build/trans_presets.java:1504 +#: build/trans_presets.java:1365 msgid "Edit Subway Entrance" msgstr "Rediger T-baneinngang" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1509 build/trans_presets.java:2428 +#: build/trans_presets.java:1370 build/trans_presets.java:2289 msgid "Wheelchair" msgstr "Rullestol" @@ -21083,5 +20752,5 @@ #. #. -#: build/trans_presets.java:1514 +#: build/trans_presets.java:1375 msgid "Bus Station" msgstr "Busstasjon" @@ -21090,5 +20759,5 @@ #. -#: build/trans_presets.java:1517 +#: build/trans_presets.java:1378 msgid "Edit Bus Station" msgstr "Rediger busstasjon" @@ -21096,5 +20765,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1384 msgid "Bus Stop" msgstr "Bussholdeplass" @@ -21104,5 +20773,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1527 +#: build/trans_presets.java:1388 msgid "Edit Bus Stop" msgstr "Rediger bussholdeplass" @@ -21111,25 +20780,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1532 build/trans_presets.java:1789 -#: build/trans_presets.java:2473 +#: build/trans_presets.java:1393 build/trans_presets.java:1650 +#: build/trans_presets.java:2334 msgid "Shelter" msgstr "Leskur / Ly for natten" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:1533 build/trans_presets.java:2461 +#: build/trans_presets.java:1394 build/trans_presets.java:2322 msgid "Bench" msgstr "Benk" -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1395 msgid "Tactile Paving" msgstr "" #. -#: build/trans_presets.java:1538 +#: build/trans_presets.java:1399 msgid "Bus Platform" msgstr "Bussplatform" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1400 msgid "Edit Bus Platform" msgstr "Rediger bussplattform" @@ -21137,5 +20806,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1408 msgid "Taxi" msgstr "Taxi" @@ -21143,5 +20812,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1410 msgid "Edit Taxi station" msgstr "Rediger taxi-stasjon" @@ -21149,5 +20818,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1554 +#: build/trans_presets.java:1415 msgid "Airport" msgstr "Flyplass" @@ -21155,15 +20824,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1417 msgid "Edit Airport" msgstr "Rediger flyplass" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1422 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1562 +#: build/trans_presets.java:1423 msgid "ICAO" msgstr "ICAO" @@ -21171,10 +20840,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1428 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1429 msgid "Accomodation" msgstr "Overnatting" @@ -21186,5 +20855,5 @@ #. #. -#: build/trans_presets.java:1569 build/trans_surveyor.java:43 +#: build/trans_presets.java:1430 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotell" @@ -21193,15 +20862,15 @@ #. -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1433 msgid "Edit Hotel" msgstr "Rediger hotell" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1575 +#: build/trans_presets.java:1436 msgid "Stars" msgstr "Stjerner" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1577 +#: build/trans_presets.java:1438 msgid "Motel" msgstr "Motell" @@ -21209,20 +20878,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1440 msgid "Edit Motel" msgstr "Rediger motell" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1444 msgid "Guest House" msgstr "Gjestehus" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1445 msgid "Edit Guest House" msgstr "Rediger gjestehus" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1449 msgid "Chalet" msgstr "Feriehytter" @@ -21230,10 +20899,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1451 msgid "Edit Chalet" msgstr "Rediger feriehytter" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1455 msgid "Hostel" msgstr "Ungdomsherberge" @@ -21241,30 +20910,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1596 +#: build/trans_presets.java:1457 msgid "Edit Hostel" msgstr "Rediger ungdomsherberge" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1600 +#: build/trans_presets.java:1461 msgid "Alpine Hut" msgstr "Fjellstue" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1462 msgid "Edit Alpine Hut" msgstr "Rediger fjellstue" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1606 +#: build/trans_presets.java:1467 msgid "Caravan Site" msgstr "Campingvognplass" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1468 msgid "Edit Caravan Site" msgstr "Rediger campingvognplass" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1472 msgid "Camping Site" msgstr "Campingplass" @@ -21272,10 +20941,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1613 +#: build/trans_presets.java:1474 msgid "Edit Camping Site" msgstr "Rediger campingplass" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1479 msgid "Food+Drinks" msgstr "Mat og drikke" @@ -21286,5 +20955,5 @@ #. #. -#: build/trans_presets.java:1619 build/trans_surveyor.java:47 +#: build/trans_presets.java:1480 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -21292,5 +20961,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1621 +#: build/trans_presets.java:1482 msgid "Edit Restaurant" msgstr "Rediger restaurant" @@ -21298,5 +20967,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1624 build/trans_presets.java:1632 +#: build/trans_presets.java:1485 build/trans_presets.java:1493 msgid "Cuisine" msgstr "Kjøkken" @@ -21304,61 +20973,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1624 build/trans_presets.java:1632 +#: build/trans_presets.java:1485 build/trans_presets.java:1493 msgid "italian" msgstr "italiensk" -#: build/trans_presets.java:1624 build/trans_presets.java:1632 +#: build/trans_presets.java:1485 build/trans_presets.java:1493 msgid "chinese" msgstr "kinesisk" -#: build/trans_presets.java:1624 build/trans_presets.java:1632 +#: build/trans_presets.java:1485 build/trans_presets.java:1493 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1624 build/trans_presets.java:1632 +#: build/trans_presets.java:1485 build/trans_presets.java:1493 msgid "burger" msgstr "gatekjøkken" -#: build/trans_presets.java:1624 build/trans_presets.java:1632 +#: build/trans_presets.java:1485 build/trans_presets.java:1493 msgid "greek" msgstr "gresk" -#: build/trans_presets.java:1624 build/trans_presets.java:1632 +#: build/trans_presets.java:1485 build/trans_presets.java:1493 msgid "german" msgstr "tysk" -#: build/trans_presets.java:1624 build/trans_presets.java:1632 +#: build/trans_presets.java:1485 build/trans_presets.java:1493 msgid "indian" msgstr "indisk" -#: build/trans_presets.java:1624 build/trans_presets.java:1632 +#: build/trans_presets.java:1485 build/trans_presets.java:1493 msgid "regional" msgstr "lokal" -#: build/trans_presets.java:1624 build/trans_presets.java:1632 +#: build/trans_presets.java:1485 build/trans_presets.java:1493 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1624 build/trans_presets.java:1632 +#: build/trans_presets.java:1485 build/trans_presets.java:1493 msgid "turkish" msgstr "tyrkisk" -#: build/trans_presets.java:1624 build/trans_presets.java:1632 +#: build/trans_presets.java:1485 build/trans_presets.java:1493 msgid "asian" msgstr "asiatisk" -#: build/trans_presets.java:1624 build/trans_presets.java:1632 +#: build/trans_presets.java:1485 build/trans_presets.java:1493 msgid "thai" msgstr "thai" -#: build/trans_presets.java:1624 build/trans_presets.java:1632 +#: build/trans_presets.java:1485 build/trans_presets.java:1493 msgid "mexican" msgstr "meksikansk" -#: build/trans_presets.java:1624 build/trans_presets.java:1632 +#: build/trans_presets.java:1485 build/trans_presets.java:1493 msgid "japanese" msgstr "japansk" -#: build/trans_presets.java:1627 +#: build/trans_presets.java:1488 msgid "Fast Food" msgstr "Gatekjøkken" @@ -21366,9 +21035,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1490 msgid "Edit Fast Food Restaurant" msgstr "Rediger gatekjøkken" -#: build/trans_presets.java:1635 +#: build/trans_presets.java:1496 msgid "Cafe" msgstr "Kafé" @@ -21376,9 +21045,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1637 +#: build/trans_presets.java:1498 msgid "Edit Cafe" msgstr "Rediger kafé" -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1503 msgid "Pub" msgstr "Pub" @@ -21386,18 +21055,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1644 +#: build/trans_presets.java:1505 msgid "Edit Pub" msgstr "Rediger pub" -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1510 msgid "Biergarten" msgstr "Biergarten" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1650 +#: build/trans_presets.java:1511 msgid "Edit Biergarten" msgstr "Rediger Biergarten" -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1516 msgid "Bar" msgstr "Bar" @@ -21405,9 +21074,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1657 +#: build/trans_presets.java:1518 msgid "Edit Bar" msgstr "Rediger bar" -#: build/trans_presets.java:1662 +#: build/trans_presets.java:1523 msgid "Nightclub" msgstr "Nattklubb" @@ -21415,24 +21084,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1664 +#: build/trans_presets.java:1525 msgid "Edit Nightclub" msgstr "Rediger nattklubb" -#: build/trans_presets.java:1670 +#: build/trans_presets.java:1531 msgid "Tourism" msgstr "Turisme" #. group "Tourism" -#: build/trans_presets.java:1671 +#: build/trans_presets.java:1532 msgid "Attraction" msgstr "Attraksjon" #. item "Tourism/Attraction" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1533 msgid "Edit Attraction" msgstr "Rediger attraksjon" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1677 +#: build/trans_presets.java:1538 msgid "Museum" msgstr "Museum" @@ -21440,9 +21109,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1540 msgid "Edit Museum" msgstr "Rediger museum" -#: build/trans_presets.java:1684 +#: build/trans_presets.java:1545 msgid "Zoo" msgstr "Zoologisk hage" @@ -21451,9 +21120,9 @@ #. -#: build/trans_presets.java:1687 +#: build/trans_presets.java:1548 msgid "Edit Zoo" msgstr "Rediger zoologisk hage" -#: build/trans_presets.java:1692 +#: build/trans_presets.java:1553 msgid "Viewpoint" msgstr "Utsiktspunkt" @@ -21461,24 +21130,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1694 +#: build/trans_presets.java:1555 msgid "Edit Viewpoint" msgstr "Rediger utsiktspunkt" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1697 +#: build/trans_presets.java:1558 msgid "Look-Out Tower" msgstr "Utsiktstårn" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1699 +#: build/trans_presets.java:1560 msgid "Theme Park" msgstr "Temapark" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1700 +#: build/trans_presets.java:1561 msgid "Edit Theme Park" msgstr "Rediger temapark" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1566 msgid "Artwork" msgstr "Kunstverk" @@ -21486,5 +21155,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1707 +#: build/trans_presets.java:1568 msgid "Edit Artwork" msgstr "Rediger kunstverk" @@ -21492,19 +21161,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1712 +#: build/trans_presets.java:1573 msgid "Information Office" msgstr "Turistinformasjon" -#: build/trans_presets.java:1719 +#: build/trans_presets.java:1580 msgid "Map" msgstr "Kart" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1724 +#: build/trans_presets.java:1585 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1724 +#: build/trans_presets.java:1585 msgid "topo" msgstr "" @@ -21515,5 +21184,5 @@ #. 30000 #. -#. +#. #. #. @@ -21523,5 +21192,5 @@ #. 40000 #. -#. +#. #. #. @@ -21531,5 +21200,5 @@ #. 20000 #. -#. +#. #. #. @@ -21539,8 +21208,8 @@ #. 40000 #. -#. +#. #. #. -#: build/trans_presets.java:1724 build/trans_style.java:625 +#: build/trans_presets.java:1585 build/trans_style.java:625 #: build/trans_style.java:641 build/trans_style.java:657 #: build/trans_style.java:665 @@ -21548,28 +21217,28 @@ msgstr "gate" -#: build/trans_presets.java:1724 +#: build/trans_presets.java:1585 msgid "scheme" msgstr "" -#: build/trans_presets.java:1725 +#: build/trans_presets.java:1586 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1725 +#: build/trans_presets.java:1586 msgid "site" msgstr "" -#: build/trans_presets.java:1725 +#: build/trans_presets.java:1586 msgid "city" msgstr "" -#: build/trans_presets.java:1725 +#: build/trans_presets.java:1586 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1726 build/trans_presets.java:1742 -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1587 build/trans_presets.java:1603 +#: build/trans_presets.java:1647 msgid "Closer Description" msgstr "Nærmere forklaring" @@ -21579,12 +21248,18 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1728 build/trans_presets.java:1751 +#: build/trans_presets.java:1589 build/trans_presets.java:1612 msgid "Routes shown for:" msgstr "" + +#. item "Tourism/Map" label "Routes shown for:" +#. item "Tourism/Guidepost" label "Routes shown for:" +#: build/trans_presets.java:1590 build/trans_presets.java:1613 +msgid "Hiking" +msgstr "Tursti" #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1730 build/trans_presets.java:1753 -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1591 build/trans_presets.java:1614 +#: build/trans_presets.java:1832 msgid "Cycling" msgstr "Sykling" @@ -21592,5 +21267,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1731 build/trans_presets.java:1754 +#: build/trans_presets.java:1592 build/trans_presets.java:1615 msgid "Mountainbiking" msgstr "" @@ -21598,6 +21273,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1732 build/trans_presets.java:1755 -#: build/trans_presets.java:2025 +#: build/trans_presets.java:1593 build/trans_presets.java:1616 +#: build/trans_presets.java:1886 msgid "Skiing" msgstr "Ski" @@ -21605,5 +21280,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1733 build/trans_presets.java:1756 +#: build/trans_presets.java:1594 build/trans_presets.java:1617 msgid "Riding" msgstr "" @@ -21611,46 +21286,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1734 build/trans_presets.java:1757 +#: build/trans_presets.java:1595 build/trans_presets.java:1618 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1597 msgid "Information Board" msgstr "Informasjonstavle" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1741 +#: build/trans_presets.java:1602 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1741 +#: build/trans_presets.java:1602 msgid "notice" msgstr "" -#: build/trans_presets.java:1741 +#: build/trans_presets.java:1602 msgid "history" msgstr "historisk" -#: build/trans_presets.java:1741 +#: build/trans_presets.java:1602 msgid "nature" msgstr "natur" -#: build/trans_presets.java:1741 +#: build/trans_presets.java:1602 msgid "wildlife" msgstr "dyreliv" -#: build/trans_presets.java:1741 +#: build/trans_presets.java:1602 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1605 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1759 +#: build/trans_presets.java:1620 msgid "Information Terminal" msgstr "" @@ -21658,29 +21333,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1764 build/trans_presets.java:1774 +#: build/trans_presets.java:1625 build/trans_presets.java:1635 msgid "Closer description" msgstr "" -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1630 msgid "Audioguide" msgstr "" #. -#: build/trans_presets.java:1779 +#: build/trans_presets.java:1640 msgid "Audioguide via mobile phone?" msgstr "" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1780 +#: build/trans_presets.java:1641 msgid "Phone number" msgstr "" #. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1782 +#: build/trans_presets.java:1643 msgid "Other Information Points" msgstr "Annen informasjon" #. item "Tourism/Shelter" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1651 msgid "Edit Shelter" msgstr "Rediger ly for natten" @@ -21688,25 +21363,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1793 build/trans_presets.java:1799 +#: build/trans_presets.java:1654 build/trans_presets.java:1660 msgid "Fireplace" msgstr "Bålplass" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1795 +#: build/trans_presets.java:1656 msgid "Picnic Site" msgstr "Piknik-sted" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1657 msgid "Edit Picnic Site" msgstr "Rediger piknik-sted" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1802 +#: build/trans_presets.java:1663 msgid "Historic Places" msgstr "Historiske steder" #. group "Historic Places" -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1664 msgid "Castle" msgstr "Slott" @@ -21715,19 +21390,19 @@ #. -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1667 msgid "Edit Castle" msgstr "Rediger slott" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1810 +#: build/trans_presets.java:1671 msgid "Ruins" msgstr "Ruiner" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1811 +#: build/trans_presets.java:1672 msgid "Edit Ruins" msgstr "Rediger ruiner" -#: build/trans_presets.java:1816 +#: build/trans_presets.java:1677 msgid "Archaeological Site" msgstr "Arkeologisk plass" @@ -21736,9 +21411,9 @@ #. -#: build/trans_presets.java:1819 +#: build/trans_presets.java:1680 msgid "Edit Archaeological Site" msgstr "Rediger arkeologisk plass" -#: build/trans_presets.java:1824 +#: build/trans_presets.java:1685 msgid "Battlefield" msgstr "Slagmark" @@ -21746,10 +21421,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1826 +#: build/trans_presets.java:1687 msgid "Edit Battlefield" msgstr "Rediger slagmark" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1691 msgid "Palaeontological Site" msgstr "" @@ -21757,5 +21432,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1832 +#: build/trans_presets.java:1693 msgid "Edit Palaeontological Site" msgstr "" @@ -21763,15 +21438,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1698 msgid "Monument" msgstr "Monument" #. item "Historic Places/Monument" -#: build/trans_presets.java:1838 +#: build/trans_presets.java:1699 msgid "Edit Monument" msgstr "Rediger monument" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1842 +#: build/trans_presets.java:1703 msgid "Memorial" msgstr "Minneplatte" @@ -21779,55 +21454,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1844 +#: build/trans_presets.java:1705 msgid "Edit Memorial" msgstr "Rediger minneplatte" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1709 msgid "Wayside Cross" msgstr "Kors i veikant" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1710 msgid "Edit Wayside Cross" msgstr "Rediger kors i veikant" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1714 msgid "Wayside Shrine" msgstr "Veialter" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1854 +#: build/trans_presets.java:1715 msgid "Edit Wayside Shrine" msgstr "Rediger veialter" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1719 msgid "Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1720 msgid "Edit Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1725 msgid "Leisure" msgstr "Fritid" #. group "Leisure" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1726 msgid "Water Park" msgstr "Badepark" #. item "Leisure/Water Park" -#: build/trans_presets.java:1866 +#: build/trans_presets.java:1727 msgid "Edit Water Park" msgstr "Rediger badepark" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1731 msgid "Playground" msgstr "Lekeplass" @@ -21835,35 +21510,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1872 +#: build/trans_presets.java:1733 msgid "Edit Playground" msgstr "Rediger lekeplass" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1737 msgid "Fishing" msgstr "Fiskeplass" #. item "Leisure/Fishing" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1738 msgid "Edit Fishing" msgstr "Rediger fiskeplass" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1883 build/trans_presets.java:2703 +#: build/trans_presets.java:1744 build/trans_presets.java:2564 msgid "Sports" msgstr "Sport" #. group "Sports" -#: build/trans_presets.java:1884 +#: build/trans_presets.java:1745 msgid "Sport Facilities" msgstr "Sport" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1885 +#: build/trans_presets.java:1746 msgid "Stadium" msgstr "Stadion" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1886 +#: build/trans_presets.java:1747 msgid "Edit Stadium" msgstr "Rediger stadion" @@ -21877,6 +21552,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1890 build/trans_presets.java:1899 -#: build/trans_presets.java:1908 build/trans_presets.java:1917 +#: build/trans_presets.java:1751 build/trans_presets.java:1760 +#: build/trans_presets.java:1769 build/trans_presets.java:1778 msgid "select sport:" msgstr "velg sport:" @@ -21895,7 +21570,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21905,5 +21580,5 @@ #. 50000 #. -#. +#. #. #. @@ -21913,5 +21588,5 @@ #. 50000 #. -#. +#. #. #. @@ -21921,5 +21596,5 @@ #. 50000 #. -#. +#. #. #. @@ -21929,5 +21604,5 @@ #. 50000 #. -#. +#. #. #. @@ -21937,5 +21612,5 @@ #. 50000 #. -#. +#. #. #. @@ -21945,5 +21620,5 @@ #. 50000 #. -#. +#. #. #. @@ -21953,5 +21628,5 @@ #. 50000 #. -#. +#. #. #. @@ -21961,5 +21636,5 @@ #. 50000 #. -#. +#. #. #. @@ -21969,5 +21644,5 @@ #. 50000 #. -#. +#. #. #. @@ -21977,5 +21652,5 @@ #. 50000 #. -#. +#. #. #. @@ -21985,5 +21660,5 @@ #. 50000 #. -#. +#. #. #. @@ -21993,5 +21668,5 @@ #. 50000 #. -#. +#. #. #. @@ -22001,5 +21676,5 @@ #. 50000 #. -#. +#. #. #. @@ -22009,5 +21684,5 @@ #. 50000 #. -#. +#. #. #. @@ -22017,5 +21692,5 @@ #. 50000 #. -#. +#. #. #. @@ -22025,5 +21700,5 @@ #. 50000 #. -#. +#. #. #. @@ -22033,5 +21708,5 @@ #. 50000 #. -#. +#. #. #. @@ -22041,5 +21716,5 @@ #. 50000 #. -#. +#. #. #. @@ -22049,5 +21724,5 @@ #. 50000 #. -#. +#. #. #. @@ -22057,5 +21732,5 @@ #. 50000 #. -#. +#. #. #. @@ -22065,5 +21740,5 @@ #. 50000 #. -#. +#. #. #. @@ -22073,5 +21748,5 @@ #. 50000 #. -#. +#. #. #. @@ -22081,5 +21756,5 @@ #. 50000 #. -#. +#. #. #. @@ -22089,5 +21764,5 @@ #. 50000 #. -#. +#. #. #. @@ -22097,5 +21772,5 @@ #. 50000 #. -#. +#. #. #. @@ -22105,5 +21780,5 @@ #. 50000 #. -#. +#. #. #. @@ -22113,5 +21788,5 @@ #. 50000 #. -#. +#. #. #. @@ -22121,5 +21796,5 @@ #. 50000 #. -#. +#. #. #. @@ -22129,5 +21804,5 @@ #. 50000 #. -#. +#. #. #. @@ -22137,5 +21812,5 @@ #. 50000 #. -#. +#. #. #. @@ -22145,5 +21820,5 @@ #. 50000 #. -#. +#. #. #. @@ -22153,5 +21828,5 @@ #. 50000 #. -#. +#. #. #. @@ -22161,5 +21836,5 @@ #. 50000 #. -#. +#. #. #. @@ -22169,5 +21844,5 @@ #. 50000 #. -#. +#. #. #. @@ -22177,5 +21852,5 @@ #. 50000 #. -#. +#. #. #. @@ -22185,5 +21860,5 @@ #. 50000 #. -#. +#. #. #. @@ -22193,5 +21868,5 @@ #. 50000 #. -#. +#. #. #. @@ -22201,5 +21876,5 @@ #. 50000 #. -#. +#. #. #. @@ -22209,5 +21884,5 @@ #. 50000 #. -#. +#. #. #. @@ -22217,5 +21892,5 @@ #. 50000 #. -#. +#. #. #. @@ -22225,5 +21900,5 @@ #. 50000 #. -#. +#. #. #. @@ -22233,5 +21908,5 @@ #. 50000 #. -#. +#. #. #. @@ -22241,5 +21916,5 @@ #. 50000 #. -#. +#. #. #. @@ -22249,5 +21924,5 @@ #. 50000 #. -#. +#. #. #. @@ -22257,5 +21932,5 @@ #. 50000 #. -#. +#. #. #. @@ -22265,33 +21940,33 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 -#: build/trans_style.java:3674 build/trans_style.java:3682 -#: build/trans_style.java:3690 build/trans_style.java:3698 -#: build/trans_style.java:3706 build/trans_style.java:3714 -#: build/trans_style.java:3722 build/trans_style.java:3730 -#: build/trans_style.java:3738 build/trans_style.java:3746 -#: build/trans_style.java:3754 build/trans_style.java:3762 -#: build/trans_style.java:3770 build/trans_style.java:3778 -#: build/trans_style.java:3786 build/trans_style.java:3794 -#: build/trans_style.java:3802 build/trans_style.java:3810 -#: build/trans_style.java:3818 build/trans_style.java:3826 -#: build/trans_style.java:3834 build/trans_style.java:3842 -#: build/trans_style.java:3850 build/trans_style.java:3858 -#: build/trans_style.java:3866 build/trans_style.java:3874 -#: build/trans_style.java:3882 build/trans_style.java:3890 -#: build/trans_style.java:3898 build/trans_style.java:3906 -#: build/trans_style.java:3914 build/trans_style.java:3922 -#: build/trans_style.java:3930 build/trans_style.java:3938 -#: build/trans_style.java:3946 build/trans_style.java:3954 -#: build/trans_style.java:3962 build/trans_style.java:3970 -#: build/trans_style.java:3978 build/trans_style.java:3986 -#: build/trans_style.java:3994 build/trans_style.java:4002 -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 +#: build/trans_style.java:3705 build/trans_style.java:3713 +#: build/trans_style.java:3721 build/trans_style.java:3729 +#: build/trans_style.java:3737 build/trans_style.java:3745 +#: build/trans_style.java:3753 build/trans_style.java:3761 +#: build/trans_style.java:3769 build/trans_style.java:3777 +#: build/trans_style.java:3785 build/trans_style.java:3793 +#: build/trans_style.java:3801 build/trans_style.java:3809 +#: build/trans_style.java:3817 build/trans_style.java:3825 +#: build/trans_style.java:3833 build/trans_style.java:3841 +#: build/trans_style.java:3849 build/trans_style.java:3857 +#: build/trans_style.java:3865 build/trans_style.java:3873 +#: build/trans_style.java:3881 build/trans_style.java:3889 +#: build/trans_style.java:3897 build/trans_style.java:3905 +#: build/trans_style.java:3913 build/trans_style.java:3921 +#: build/trans_style.java:3929 build/trans_style.java:3937 +#: build/trans_style.java:3945 build/trans_style.java:3953 +#: build/trans_style.java:3961 build/trans_style.java:3969 +#: build/trans_style.java:3977 build/trans_style.java:3985 +#: build/trans_style.java:3993 build/trans_style.java:4001 +#: build/trans_style.java:4009 build/trans_style.java:4017 +#: build/trans_style.java:4025 build/trans_style.java:4033 +#: build/trans_style.java:4041 build/trans_style.java:4049 +#: build/trans_style.java:4057 build/trans_style.java:4065 +#: build/trans_style.java:4073 msgid "sport" msgstr "sport" @@ -22301,225 +21976,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "multi" msgstr "flerbruk" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "archery" msgstr "bueskyting" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "athletics" msgstr "turn" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "australian_football" msgstr "australsk fotball" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "baseball" msgstr "baseball" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "basketball" msgstr "basketball" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "boules" msgstr "boules" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "bowls" msgstr "bowls" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "canoe" msgstr "kano" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "climbing" msgstr "klatring" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "cricket" msgstr "cricket" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "cricket_nets" msgstr "cricketnett" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "croquet" msgstr "krocket" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "cycling" msgstr "sykling" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "dog_racing" msgstr "hundeløp" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "equestrian" msgstr "ridning" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "football" msgstr "football" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "gymnastics" msgstr "gymnastikk" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "hockey" msgstr "ishockey" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "horse_racing" msgstr "hesteløp" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "motor" msgstr "motorsport" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "pelota" msgstr "pelota" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "racquet" msgstr "racquet" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "rugby" msgstr "rugby" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "shooting" msgstr "skyting" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "skateboard" msgstr "skateboard" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "skating" msgstr "skøyter" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "skiing" msgstr "ski" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "soccer" msgstr "fotball" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "swimming" msgstr "svømming" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "table_tennis" msgstr "bordtennis" -#: build/trans_presets.java:1892 build/trans_presets.java:1901 -#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_presets.java:1753 build/trans_presets.java:1762 +#: build/trans_presets.java:1771 build/trans_presets.java:1780 msgid "tennis" msgstr "tennis" -#: build/trans_presets.java:1894 +#: build/trans_presets.java:1755 msgid "Sports Centre" msgstr "Sportssenter" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1756 msgid "Edit Sports Centre" msgstr "Rediger sportssenter" -#: build/trans_presets.java:1903 +#: build/trans_presets.java:1764 msgid "Pitch" msgstr "Bane" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1904 +#: build/trans_presets.java:1765 msgid "Edit Pitch" msgstr "Rediger bane" -#: build/trans_presets.java:1912 +#: build/trans_presets.java:1773 msgid "Racetrack" msgstr "Racerbane" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1913 +#: build/trans_presets.java:1774 msgid "Edit Racetrack" msgstr "Rediger racerbane" -#: build/trans_presets.java:1921 +#: build/trans_presets.java:1782 msgid "Golf Course" msgstr "Golfbane" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1922 +#: build/trans_presets.java:1783 msgid "Edit Golf Course" msgstr "Rediger golfbane" -#: build/trans_presets.java:1927 +#: build/trans_presets.java:1788 msgid "Miniature Golf" msgstr "Minigolf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1928 +#: build/trans_presets.java:1789 msgid "Edit Miniature Golf" msgstr "Rediger minigolf" -#: build/trans_presets.java:1934 +#: build/trans_presets.java:1795 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1935 +#: build/trans_presets.java:1796 msgid "Multi" msgstr "Flerbruk" #. item "Sport/Multi" -#: build/trans_presets.java:1936 +#: build/trans_presets.java:1797 msgid "Edit Multi" msgstr "Rediger flerbruk" @@ -22558,21 +22233,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1939 build/trans_presets.java:1945 -#: build/trans_presets.java:1951 build/trans_presets.java:1957 -#: build/trans_presets.java:1963 build/trans_presets.java:1969 -#: build/trans_presets.java:1975 build/trans_presets.java:1981 -#: build/trans_presets.java:1987 build/trans_presets.java:1993 -#: build/trans_presets.java:1999 build/trans_presets.java:2005 -#: build/trans_presets.java:2011 build/trans_presets.java:2017 -#: build/trans_presets.java:2023 build/trans_presets.java:2032 -#: build/trans_presets.java:2039 build/trans_presets.java:2047 -#: build/trans_presets.java:2053 build/trans_presets.java:2059 -#: build/trans_presets.java:2065 build/trans_presets.java:2071 -#: build/trans_presets.java:2077 build/trans_presets.java:2083 -#: build/trans_presets.java:2089 build/trans_presets.java:2095 -#: build/trans_presets.java:2101 build/trans_presets.java:2107 -#: build/trans_presets.java:2113 build/trans_presets.java:2119 -#: build/trans_presets.java:2125 build/trans_presets.java:2131 -#: build/trans_presets.java:2137 build/trans_presets.java:2143 +#: build/trans_presets.java:1800 build/trans_presets.java:1806 +#: build/trans_presets.java:1812 build/trans_presets.java:1818 +#: build/trans_presets.java:1824 build/trans_presets.java:1830 +#: build/trans_presets.java:1836 build/trans_presets.java:1842 +#: build/trans_presets.java:1848 build/trans_presets.java:1854 +#: build/trans_presets.java:1860 build/trans_presets.java:1866 +#: build/trans_presets.java:1872 build/trans_presets.java:1878 +#: build/trans_presets.java:1884 build/trans_presets.java:1893 +#: build/trans_presets.java:1900 build/trans_presets.java:1908 +#: build/trans_presets.java:1914 build/trans_presets.java:1920 +#: build/trans_presets.java:1926 build/trans_presets.java:1932 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 msgid "type" msgstr "type" @@ -22611,203 +22286,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1939 build/trans_presets.java:1945 -#: build/trans_presets.java:1951 build/trans_presets.java:1957 -#: build/trans_presets.java:1963 build/trans_presets.java:1969 -#: build/trans_presets.java:1975 build/trans_presets.java:1981 -#: build/trans_presets.java:1987 build/trans_presets.java:1993 -#: build/trans_presets.java:1999 build/trans_presets.java:2005 -#: build/trans_presets.java:2011 build/trans_presets.java:2017 -#: build/trans_presets.java:2023 build/trans_presets.java:2032 -#: build/trans_presets.java:2039 build/trans_presets.java:2047 -#: build/trans_presets.java:2053 build/trans_presets.java:2059 -#: build/trans_presets.java:2065 build/trans_presets.java:2071 -#: build/trans_presets.java:2077 build/trans_presets.java:2083 -#: build/trans_presets.java:2089 build/trans_presets.java:2095 -#: build/trans_presets.java:2101 build/trans_presets.java:2107 -#: build/trans_presets.java:2113 build/trans_presets.java:2119 -#: build/trans_presets.java:2125 build/trans_presets.java:2131 -#: build/trans_presets.java:2137 build/trans_presets.java:2143 +#: build/trans_presets.java:1800 build/trans_presets.java:1806 +#: build/trans_presets.java:1812 build/trans_presets.java:1818 +#: build/trans_presets.java:1824 build/trans_presets.java:1830 +#: build/trans_presets.java:1836 build/trans_presets.java:1842 +#: build/trans_presets.java:1848 build/trans_presets.java:1854 +#: build/trans_presets.java:1860 build/trans_presets.java:1866 +#: build/trans_presets.java:1872 build/trans_presets.java:1878 +#: build/trans_presets.java:1884 build/trans_presets.java:1893 +#: build/trans_presets.java:1900 build/trans_presets.java:1908 +#: build/trans_presets.java:1914 build/trans_presets.java:1920 +#: build/trans_presets.java:1926 build/trans_presets.java:1932 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 msgid "pitch" msgstr "bane" -#: build/trans_presets.java:1939 build/trans_presets.java:1945 -#: build/trans_presets.java:1951 build/trans_presets.java:1957 -#: build/trans_presets.java:1963 build/trans_presets.java:1969 -#: build/trans_presets.java:1975 build/trans_presets.java:1981 -#: build/trans_presets.java:1987 build/trans_presets.java:1993 -#: build/trans_presets.java:1999 build/trans_presets.java:2005 -#: build/trans_presets.java:2011 build/trans_presets.java:2017 -#: build/trans_presets.java:2023 build/trans_presets.java:2032 -#: build/trans_presets.java:2039 build/trans_presets.java:2047 -#: build/trans_presets.java:2053 build/trans_presets.java:2059 -#: build/trans_presets.java:2065 build/trans_presets.java:2071 -#: build/trans_presets.java:2077 build/trans_presets.java:2083 -#: build/trans_presets.java:2089 build/trans_presets.java:2095 -#: build/trans_presets.java:2101 build/trans_presets.java:2107 -#: build/trans_presets.java:2113 build/trans_presets.java:2119 -#: build/trans_presets.java:2125 build/trans_presets.java:2131 -#: build/trans_presets.java:2137 build/trans_presets.java:2143 +#: build/trans_presets.java:1800 build/trans_presets.java:1806 +#: build/trans_presets.java:1812 build/trans_presets.java:1818 +#: build/trans_presets.java:1824 build/trans_presets.java:1830 +#: build/trans_presets.java:1836 build/trans_presets.java:1842 +#: build/trans_presets.java:1848 build/trans_presets.java:1854 +#: build/trans_presets.java:1860 build/trans_presets.java:1866 +#: build/trans_presets.java:1872 build/trans_presets.java:1878 +#: build/trans_presets.java:1884 build/trans_presets.java:1893 +#: build/trans_presets.java:1900 build/trans_presets.java:1908 +#: build/trans_presets.java:1914 build/trans_presets.java:1920 +#: build/trans_presets.java:1926 build/trans_presets.java:1932 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 msgid "sports_centre" msgstr "sportssenter" -#: build/trans_presets.java:1939 build/trans_presets.java:1945 -#: build/trans_presets.java:1951 build/trans_presets.java:1957 -#: build/trans_presets.java:1963 build/trans_presets.java:1969 -#: build/trans_presets.java:1975 build/trans_presets.java:1981 -#: build/trans_presets.java:1987 build/trans_presets.java:1993 -#: build/trans_presets.java:1999 build/trans_presets.java:2005 -#: build/trans_presets.java:2011 build/trans_presets.java:2017 -#: build/trans_presets.java:2023 build/trans_presets.java:2032 -#: build/trans_presets.java:2039 build/trans_presets.java:2047 -#: build/trans_presets.java:2053 build/trans_presets.java:2059 -#: build/trans_presets.java:2065 build/trans_presets.java:2071 -#: build/trans_presets.java:2077 build/trans_presets.java:2083 -#: build/trans_presets.java:2089 build/trans_presets.java:2095 -#: build/trans_presets.java:2101 build/trans_presets.java:2107 -#: build/trans_presets.java:2113 build/trans_presets.java:2119 -#: build/trans_presets.java:2125 build/trans_presets.java:2131 -#: build/trans_presets.java:2137 build/trans_presets.java:2143 +#: build/trans_presets.java:1800 build/trans_presets.java:1806 +#: build/trans_presets.java:1812 build/trans_presets.java:1818 +#: build/trans_presets.java:1824 build/trans_presets.java:1830 +#: build/trans_presets.java:1836 build/trans_presets.java:1842 +#: build/trans_presets.java:1848 build/trans_presets.java:1854 +#: build/trans_presets.java:1860 build/trans_presets.java:1866 +#: build/trans_presets.java:1872 build/trans_presets.java:1878 +#: build/trans_presets.java:1884 build/trans_presets.java:1893 +#: build/trans_presets.java:1900 build/trans_presets.java:1908 +#: build/trans_presets.java:1914 build/trans_presets.java:1920 +#: build/trans_presets.java:1926 build/trans_presets.java:1932 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 msgid "stadium" msgstr "stadion" -#: build/trans_presets.java:1939 build/trans_presets.java:1945 -#: build/trans_presets.java:1951 build/trans_presets.java:1957 -#: build/trans_presets.java:1963 build/trans_presets.java:1969 -#: build/trans_presets.java:1975 build/trans_presets.java:1981 -#: build/trans_presets.java:1987 build/trans_presets.java:1993 -#: build/trans_presets.java:1999 build/trans_presets.java:2005 -#: build/trans_presets.java:2011 build/trans_presets.java:2017 -#: build/trans_presets.java:2023 build/trans_presets.java:2032 -#: build/trans_presets.java:2039 build/trans_presets.java:2047 -#: build/trans_presets.java:2053 build/trans_presets.java:2059 -#: build/trans_presets.java:2065 build/trans_presets.java:2071 -#: build/trans_presets.java:2077 build/trans_presets.java:2083 -#: build/trans_presets.java:2089 build/trans_presets.java:2095 -#: build/trans_presets.java:2101 build/trans_presets.java:2107 -#: build/trans_presets.java:2113 build/trans_presets.java:2119 -#: build/trans_presets.java:2125 build/trans_presets.java:2131 -#: build/trans_presets.java:2137 build/trans_presets.java:2143 +#: build/trans_presets.java:1800 build/trans_presets.java:1806 +#: build/trans_presets.java:1812 build/trans_presets.java:1818 +#: build/trans_presets.java:1824 build/trans_presets.java:1830 +#: build/trans_presets.java:1836 build/trans_presets.java:1842 +#: build/trans_presets.java:1848 build/trans_presets.java:1854 +#: build/trans_presets.java:1860 build/trans_presets.java:1866 +#: build/trans_presets.java:1872 build/trans_presets.java:1878 +#: build/trans_presets.java:1884 build/trans_presets.java:1893 +#: build/trans_presets.java:1900 build/trans_presets.java:1908 +#: build/trans_presets.java:1914 build/trans_presets.java:1920 +#: build/trans_presets.java:1926 build/trans_presets.java:1932 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 msgid "track" msgstr "" -#: build/trans_presets.java:1941 +#: build/trans_presets.java:1802 msgid "10pin" msgstr "bowling" #. item "Sport/10pin" -#: build/trans_presets.java:1942 +#: build/trans_presets.java:1803 msgid "Edit 10pin" msgstr "Rediger bowling" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1808 msgid "Athletics" msgstr "Turn" #. item "Sport/Athletics" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:1809 msgid "Edit Athletics" msgstr "Rediger turn" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1814 msgid "Archery" msgstr "Bueskyting" #. item "Sport/Archery" -#: build/trans_presets.java:1954 +#: build/trans_presets.java:1815 msgid "Edit Archery" msgstr "Rediger bueskyting" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1820 msgid "Climbing" msgstr "Klatring" #. item "Sport/Climbing" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:1821 msgid "Edit Climbing" msgstr "Rediger klatring" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1826 msgid "Canoeing" msgstr "Kano" #. item "Sport/Canoeing" -#: build/trans_presets.java:1966 +#: build/trans_presets.java:1827 msgid "Edit Canoeing" msgstr "Rediger kano" #. item "Sport/Cycling" -#: build/trans_presets.java:1972 +#: build/trans_presets.java:1833 msgid "Edit Cycling" msgstr "Rediger sykling" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1838 msgid "Dog Racing" msgstr "Hundeløp" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1978 +#: build/trans_presets.java:1839 msgid "Edit Dog Racing" msgstr "Rediger hundeløp" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1844 msgid "Equestrian" msgstr "Ridning" #. item "Sport/Equestrian" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:1845 msgid "Edit Equestrian" msgstr "Rediger ridning" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1850 msgid "Horse Racing" msgstr "Hesteløp" #. item "Sport/Horse Racing" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:1851 msgid "Edit Horse Racing" msgstr "Rediger hesteløp" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1856 msgid "Gymnastics" msgstr "Gymnastikk" #. item "Sport/Gymnastics" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:1857 msgid "Edit Gymnastics" msgstr "Rediger gymnastikk" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1862 msgid "Motor Sports" msgstr "Motorsport" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2002 +#: build/trans_presets.java:1863 msgid "Edit Motor Sports" msgstr "Rediger motorsport" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1868 msgid "Skating" msgstr "Skøyter" #. item "Sport/Skating" -#: build/trans_presets.java:2008 +#: build/trans_presets.java:1869 msgid "Edit Skating" msgstr "Rediger skøyter" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:1874 msgid "Skateboard" msgstr "Skateboard" #. item "Sport/Skateboard" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:1875 msgid "Edit Skateboard" msgstr "Rediger skateboard" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:1880 msgid "Swimming" msgstr "Svømming" #. item "Sport/Swimming" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:1881 msgid "Edit Swimming" msgstr "Rediger svømming" @@ -22815,56 +22490,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2027 +#: build/trans_presets.java:1888 msgid "Edit Skiing" msgstr "Rediger ski" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:1891 msgid "Piste type" msgstr "Løypetype" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:1891 msgid "downhill" msgstr "slalom" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:1891 msgid "nordic" msgstr "langrenn" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:1891 msgid "snow_park" msgstr "snøpark" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:1892 msgid "Difficulty" msgstr "Vanskelighetsgrad" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:1892 msgid "novice" msgstr "begynner" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:1892 msgid "easy" msgstr "enkel" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:1892 msgid "intermediate" msgstr "middels" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:1892 msgid "advanced" msgstr "vanskelig" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:1892 msgid "expert" msgstr "ekspert" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:1892 msgid "freeride" msgstr "fristil" -#: build/trans_presets.java:2034 +#: build/trans_presets.java:1895 msgid "Shooting" msgstr "Skyting" @@ -22872,182 +22547,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1897 msgid "Edit Shooting" msgstr "Rediger skyting" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:1903 msgid "Sport (Ball)" msgstr "Ballsport" #. group "Sport (Ball)" -#: build/trans_presets.java:2043 +#: build/trans_presets.java:1904 msgid "Soccer" msgstr "Fotball" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2044 +#: build/trans_presets.java:1905 msgid "Edit Soccer" msgstr "Rediger fotball" -#: build/trans_presets.java:2049 +#: build/trans_presets.java:1910 msgid "Football" msgstr "Amerikansk fotball" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:1911 msgid "Edit Football" msgstr "Rediger amerikansk fotball" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:1916 msgid "Australian Football" msgstr "Australsk fotball" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:1917 msgid "Edit Australian Football" msgstr "Rediger australsk fotball" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:1922 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2062 +#: build/trans_presets.java:1923 msgid "Edit Baseball" msgstr "Rediger baseball" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:1928 msgid "Basketball" msgstr "Basketball" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2068 +#: build/trans_presets.java:1929 msgid "Edit Basketball" msgstr "Rediger basketball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:1934 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:1935 msgid "Edit Golf" msgstr "Rediger golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:1938 msgid "golf_course" msgstr "golfbane" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:1940 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:1941 msgid "Edit Boule" msgstr "Rediger boule" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:1946 msgid "Bowls" msgstr "Bowls" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:1947 msgid "Edit Bowls" msgstr "Rediger bowls" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:1952 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2092 +#: build/trans_presets.java:1953 msgid "Edit Cricket" msgstr "Rediger cricket" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:1958 msgid "Cricket Nets" msgstr "Cricketnett" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:1959 msgid "Edit Cricket Nets" msgstr "Rediger cricketnett" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:1964 msgid "Croquet" msgstr "Krocket" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2104 +#: build/trans_presets.java:1965 msgid "Edit Croquet" msgstr "Rediger krocket" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:1970 msgid "Hockey" msgstr "Ishockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2110 +#: build/trans_presets.java:1971 msgid "Edit Hockey" msgstr "Rediger ishockey" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:1976 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2116 +#: build/trans_presets.java:1977 msgid "Edit Pelota" msgstr "Rediger pelota" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:1982 msgid "Racquet" msgstr "Racquet" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2122 +#: build/trans_presets.java:1983 msgid "Edit Racquet" msgstr "Rediger racquet" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:1988 msgid "Rugby" msgstr "Rugby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2128 +#: build/trans_presets.java:1989 msgid "Edit Rugby" msgstr "Rediger rugby" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:1994 msgid "Table Tennis" msgstr "Bordtennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2134 +#: build/trans_presets.java:1995 msgid "Edit Table Tennis" msgstr "Rediger bordtennis" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2000 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2140 +#: build/trans_presets.java:2001 msgid "Edit Tennis" msgstr "Rediger tennis" -#: build/trans_presets.java:2147 +#: build/trans_presets.java:2008 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2148 +#: build/trans_presets.java:2009 msgid "Buildings" msgstr "Bygninger" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2010 msgid "Building" msgstr "Bygning" @@ -23055,5 +22730,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2152 +#: build/trans_presets.java:2013 msgid "Public Building" msgstr "Offentlig bygning" @@ -23061,10 +22736,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2015 msgid "Edit Public Building" msgstr "Rediger offentlig bygning" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2019 msgid "Town hall" msgstr "Rådhus" @@ -23072,10 +22747,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2021 msgid "Edit Town hall" msgstr "Rediger rådhus" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2164 +#: build/trans_presets.java:2025 msgid "Embassy" msgstr "Ambassade" @@ -23083,10 +22758,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2027 msgid "Edit Embassy" msgstr "Rediger ambassade" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2031 msgid "Courthouse" msgstr "Domstol" @@ -23095,10 +22770,10 @@ #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2034 msgid "Edit Courthouse" msgstr "Rediger domstol" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2038 msgid "Prison" msgstr "Fengsel" @@ -23107,10 +22782,10 @@ #. -#: build/trans_presets.java:2180 +#: build/trans_presets.java:2041 msgid "Edit Prison" msgstr "Rediger fengsel" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2045 msgid "Police" msgstr "Politi" @@ -23120,10 +22795,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2049 msgid "Edit Police" msgstr "Rediger politi" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2192 +#: build/trans_presets.java:2053 msgid "Fire Station" msgstr "Brannstasjon" @@ -23132,10 +22807,10 @@ #. -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2056 msgid "Edit Fire Station" msgstr "Rediger brannstasjon" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2060 msgid "Post Office" msgstr "Postkontor" @@ -23143,5 +22818,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2062 msgid "Edit Post Office" msgstr "Rediger postkontor" @@ -23149,15 +22824,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2068 msgid "Kindergarten" msgstr "Barnehage" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2069 msgid "Edit Kindergarten" msgstr "Rediger barnehage" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2073 msgid "School" msgstr "Skole" @@ -23165,10 +22840,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2214 +#: build/trans_presets.java:2075 msgid "Edit School" msgstr "Rediger skole" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2079 msgid "University" msgstr "Universitet" @@ -23176,10 +22851,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2081 msgid "Edit University" msgstr "Rediger universitet" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2224 +#: build/trans_presets.java:2085 msgid "College" msgstr "Høyskole" @@ -23187,5 +22862,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2226 +#: build/trans_presets.java:2087 msgid "Edit College" msgstr "Rediger høyskole" @@ -23193,5 +22868,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2092 msgid "Cinema" msgstr "Kino" @@ -23200,10 +22875,10 @@ #. -#: build/trans_presets.java:2234 +#: build/trans_presets.java:2095 msgid "Edit Cinema" msgstr "Rediger kino" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2238 +#: build/trans_presets.java:2099 msgid "Library" msgstr "Bibliotek" @@ -23212,9 +22887,9 @@ #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2102 msgid "Edit Library" msgstr "Rediger bibliotek" -#: build/trans_presets.java:2246 +#: build/trans_presets.java:2107 msgid "Arts Centre" msgstr "Kunstsenter" @@ -23222,10 +22897,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2248 +#: build/trans_presets.java:2109 msgid "Edit Arts Centre" msgstr "Rediger kunstsenter" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2113 msgid "Theatre" msgstr "Teater" @@ -23234,10 +22909,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2116 msgid "Edit Theatre" msgstr "Rediger teater" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2120 msgid "Place of Worship" msgstr "Tilbedelsessted" @@ -23247,5 +22922,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2124 msgid "Edit Place of Worship" msgstr "Rediger tilbedelsessted" @@ -23254,6 +22929,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2266 build/trans_presets.java:3078 -#: build/trans_presets.java:3087 +#: build/trans_presets.java:2127 build/trans_presets.java:2939 +#: build/trans_presets.java:2948 msgid "Religion" msgstr "Religion" @@ -23262,66 +22937,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2266 build/trans_presets.java:3078 -#: build/trans_presets.java:3087 +#: build/trans_presets.java:2127 build/trans_presets.java:2939 +#: build/trans_presets.java:2948 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2266 build/trans_presets.java:3078 -#: build/trans_presets.java:3087 +#: build/trans_presets.java:2127 build/trans_presets.java:2939 +#: build/trans_presets.java:2948 msgid "buddhist" msgstr "buddhist" -#: build/trans_presets.java:2266 build/trans_presets.java:3078 -#: build/trans_presets.java:3087 +#: build/trans_presets.java:2127 build/trans_presets.java:2939 +#: build/trans_presets.java:2948 msgid "christian" msgstr "kristen" -#: build/trans_presets.java:2266 build/trans_presets.java:3078 -#: build/trans_presets.java:3087 +#: build/trans_presets.java:2127 build/trans_presets.java:2939 +#: build/trans_presets.java:2948 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2266 build/trans_presets.java:3078 -#: build/trans_presets.java:3087 +#: build/trans_presets.java:2127 build/trans_presets.java:2939 +#: build/trans_presets.java:2948 msgid "jain" msgstr "jain" -#: build/trans_presets.java:2266 build/trans_presets.java:3078 -#: build/trans_presets.java:3087 +#: build/trans_presets.java:2127 build/trans_presets.java:2939 +#: build/trans_presets.java:2948 msgid "jewish" msgstr "jødisk" -#: build/trans_presets.java:2266 build/trans_presets.java:3078 -#: build/trans_presets.java:3087 +#: build/trans_presets.java:2127 build/trans_presets.java:2939 +#: build/trans_presets.java:2948 msgid "muslim" msgstr "muslim" -#: build/trans_presets.java:2266 build/trans_presets.java:3078 -#: build/trans_presets.java:3087 +#: build/trans_presets.java:2127 build/trans_presets.java:2939 +#: build/trans_presets.java:2948 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2266 build/trans_presets.java:3078 -#: build/trans_presets.java:3087 +#: build/trans_presets.java:2127 build/trans_presets.java:2939 +#: build/trans_presets.java:2948 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2266 build/trans_presets.java:3078 -#: build/trans_presets.java:3087 +#: build/trans_presets.java:2127 build/trans_presets.java:2939 +#: build/trans_presets.java:2948 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2266 build/trans_presets.java:3078 -#: build/trans_presets.java:3087 +#: build/trans_presets.java:2127 build/trans_presets.java:2939 +#: build/trans_presets.java:2948 msgid "unitarian" msgstr "unitarisk" -#: build/trans_presets.java:2266 build/trans_presets.java:3078 -#: build/trans_presets.java:3087 +#: build/trans_presets.java:2127 build/trans_presets.java:2939 +#: build/trans_presets.java:2948 msgid "zoroastrian" msgstr "zoroastrisk" -#: build/trans_presets.java:2267 build/trans_presets.java:3079 -#: build/trans_presets.java:3088 +#: build/trans_presets.java:2128 build/trans_presets.java:2940 +#: build/trans_presets.java:2949 msgid "Denomination" msgstr "Trosretniing" @@ -23330,81 +23005,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2267 build/trans_presets.java:3079 -#: build/trans_presets.java:3088 +#: build/trans_presets.java:2128 build/trans_presets.java:2940 +#: build/trans_presets.java:2949 msgid "anglican" msgstr "anglikansk" -#: build/trans_presets.java:2267 build/trans_presets.java:3079 -#: build/trans_presets.java:3088 +#: build/trans_presets.java:2128 build/trans_presets.java:2940 +#: build/trans_presets.java:2949 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2267 build/trans_presets.java:3079 -#: build/trans_presets.java:3088 +#: build/trans_presets.java:2128 build/trans_presets.java:2940 +#: build/trans_presets.java:2949 msgid "catholic" msgstr "katolsk" -#: build/trans_presets.java:2267 build/trans_presets.java:3079 -#: build/trans_presets.java:3088 +#: build/trans_presets.java:2128 build/trans_presets.java:2940 +#: build/trans_presets.java:2949 msgid "evangelical" msgstr "evangelisk" -#: build/trans_presets.java:2267 build/trans_presets.java:3079 -#: build/trans_presets.java:3088 +#: build/trans_presets.java:2128 build/trans_presets.java:2940 +#: build/trans_presets.java:2949 msgid "jehovahs_witness" msgstr "Jehovas vitner" -#: build/trans_presets.java:2267 build/trans_presets.java:3079 -#: build/trans_presets.java:3088 +#: build/trans_presets.java:2128 build/trans_presets.java:2940 +#: build/trans_presets.java:2949 msgid "lutheran" msgstr "luthersk" -#: build/trans_presets.java:2267 build/trans_presets.java:3079 -#: build/trans_presets.java:3088 +#: build/trans_presets.java:2128 build/trans_presets.java:2940 +#: build/trans_presets.java:2949 msgid "methodist" msgstr "metodist" -#: build/trans_presets.java:2267 build/trans_presets.java:3079 -#: build/trans_presets.java:3088 +#: build/trans_presets.java:2128 build/trans_presets.java:2940 +#: build/trans_presets.java:2949 msgid "mormon" msgstr "mormoner" -#: build/trans_presets.java:2267 build/trans_presets.java:3079 -#: build/trans_presets.java:3088 +#: build/trans_presets.java:2128 build/trans_presets.java:2940 +#: build/trans_presets.java:2949 msgid "orthodox" msgstr "ortodoks" -#: build/trans_presets.java:2267 build/trans_presets.java:3079 -#: build/trans_presets.java:3088 +#: build/trans_presets.java:2128 build/trans_presets.java:2940 +#: build/trans_presets.java:2949 msgid "pentecostal" msgstr "pinsebevegelsen" -#: build/trans_presets.java:2267 build/trans_presets.java:3079 -#: build/trans_presets.java:3088 +#: build/trans_presets.java:2128 build/trans_presets.java:2940 +#: build/trans_presets.java:2949 msgid "presbyterian" msgstr "presbyteriansk" -#: build/trans_presets.java:2267 build/trans_presets.java:3079 -#: build/trans_presets.java:3088 +#: build/trans_presets.java:2128 build/trans_presets.java:2940 +#: build/trans_presets.java:2949 msgid "protestant" msgstr "protestant" -#: build/trans_presets.java:2267 build/trans_presets.java:3079 -#: build/trans_presets.java:3088 +#: build/trans_presets.java:2128 build/trans_presets.java:2940 +#: build/trans_presets.java:2949 msgid "quaker" msgstr "quaker" -#: build/trans_presets.java:2267 build/trans_presets.java:3079 -#: build/trans_presets.java:3088 +#: build/trans_presets.java:2128 build/trans_presets.java:2940 +#: build/trans_presets.java:2949 msgid "shia" msgstr "shia" -#: build/trans_presets.java:2267 build/trans_presets.java:3079 -#: build/trans_presets.java:3088 +#: build/trans_presets.java:2128 build/trans_presets.java:2940 +#: build/trans_presets.java:2949 msgid "sunni" msgstr "sunni" #. -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2132 msgid "Addresses" msgstr "Adresser" @@ -23413,5 +23088,5 @@ #. -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2135 msgid "Edit Address Information" msgstr "Rediger adresseinformasjon" @@ -23419,5 +23094,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2137 msgid "House number" msgstr "Husnummer" @@ -23425,25 +23100,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2139 msgid "House name" msgstr "Husnavn" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2279 +#: build/trans_presets.java:2140 msgid "Street name" msgstr "Gatenavn" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2141 msgid "City name" msgstr "By/sted" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2281 +#: build/trans_presets.java:2142 msgid "Post code" msgstr "Postnummer" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2143 msgid "Country code" msgstr "Landskode" @@ -23452,5 +23127,5 @@ #. -#: build/trans_presets.java:2288 +#: build/trans_presets.java:2149 msgid "Edit Address Interpolation" msgstr "Rediger interpolasjon" @@ -23458,61 +23133,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2151 msgid "Numbering scheme" msgstr "Nummereringsmåte" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2151 msgid "odd" msgstr "oddetall" -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2151 msgid "even" msgstr "partall" -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2151 msgid "alphabetic" msgstr "alfabetisk" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2154 msgid "Man Made" msgstr "Menneskeskapt" #. group "Man Made" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2155 msgid "Works" msgstr "Fabrikk" #. item "Man Made/Works" -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2156 msgid "Edit Works" msgstr "Rediger fabrikk" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2160 msgid "Tower" msgstr "Tårn" #. item "Man Made/Tower" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2161 msgid "Edit Tower" msgstr "Rediger tårn" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2164 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2164 msgid "communication" msgstr "" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2164 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2166 msgid "Height (meters)" msgstr "" @@ -23520,25 +23195,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2170 msgid "Water Tower" msgstr "Vanntårn" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2171 msgid "Edit Water Tower" msgstr "Rediger vanntårn" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2175 msgid "Gasometer" msgstr "Gassbeholder" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2176 msgid "Edit Gasometer" msgstr "Rediger gassbeholder" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2319 +#: build/trans_presets.java:2180 msgid "Lighthouse" msgstr "Fyrtårn" @@ -23546,10 +23221,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2182 msgid "Edit Lighthouse" msgstr "Rediger fyrtårn" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2186 msgid "Windmill" msgstr "Vindmølle" @@ -23557,10 +23232,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2327 +#: build/trans_presets.java:2188 msgid "Edit Windmill" msgstr "Rediger vindmølle" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2192 msgid "Pipeline" msgstr "Rørledning" @@ -23569,37 +23244,37 @@ #. -#: build/trans_presets.java:2334 +#: build/trans_presets.java:2195 msgid "Edit Pipeline" msgstr "Rediger rørledning" -#: build/trans_presets.java:2337 +#: build/trans_presets.java:2198 msgid "oil" msgstr "" -#: build/trans_presets.java:2337 build/trans_presets.java:2379 +#: build/trans_presets.java:2198 build/trans_presets.java:2240 msgid "gas" msgstr "gass" -#: build/trans_presets.java:2337 +#: build/trans_presets.java:2198 msgid "sewage" msgstr "" -#: build/trans_presets.java:2337 +#: build/trans_presets.java:2198 msgid "heat" msgstr "" -#: build/trans_presets.java:2337 +#: build/trans_presets.java:2198 msgid "any substance" msgstr "" -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2199 msgid "underwater" msgstr "" -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2199 msgid "overground" msgstr "" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2201 msgid "Wastewater Plant" msgstr "Kloakkrenseanlegg" @@ -23609,10 +23284,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2344 +#: build/trans_presets.java:2205 msgid "Edit Wastewater Plant" msgstr "Rediger kloakkrenseanlegg" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2209 msgid "Crane" msgstr "Kran" @@ -23620,10 +23295,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2350 +#: build/trans_presets.java:2211 msgid "Edit Crane" msgstr "Rediger kran" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2215 msgid "Beacon" msgstr "Fyrlykt" @@ -23631,10 +23306,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2217 msgid "Edit Beacon" msgstr "Rediger fyrlykt" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2360 +#: build/trans_presets.java:2221 msgid "Survey Point" msgstr "Trigonometrisk punkt" @@ -23642,10 +23317,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2362 +#: build/trans_presets.java:2223 msgid "Edit Survey Point" msgstr "Rediger trigonometrisk punkt" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2227 msgid "Surveillance" msgstr "Overvåkingskamera" @@ -23653,5 +23328,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2368 +#: build/trans_presets.java:2229 msgid "Edit Surveillance Camera" msgstr "Rediger overvåkingskamera" @@ -23659,5 +23334,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2234 msgid "Power Generator" msgstr "Kraftverk" @@ -23667,35 +23342,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2238 msgid "Edit Power Generator" msgstr "Rediger kraftverk" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2240 msgid "wind" msgstr "vind" -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2240 msgid "hydro" msgstr "vann" -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2240 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2240 msgid "nuclear" msgstr "atom" -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2240 msgid "coal" msgstr "kull" -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2240 msgid "photovoltaic" msgstr "solcelle" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2382 +#: build/trans_presets.java:2243 msgid "Power Station" msgstr "Kraftstasjon" @@ -23704,10 +23379,10 @@ #. -#: build/trans_presets.java:2385 +#: build/trans_presets.java:2246 msgid "Edit Power Station" msgstr "Rediger kraftstasjon" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2391 +#: build/trans_presets.java:2252 msgid "Power Sub Station" msgstr "Transformatorstasjon" @@ -23716,5 +23391,5 @@ #. -#: build/trans_presets.java:2394 +#: build/trans_presets.java:2255 msgid "Edit Power Sub Station" msgstr "Rediger transformatorstasjon" @@ -23722,10 +23397,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2397 build/trans_presets.java:2414 +#: build/trans_presets.java:2258 build/trans_presets.java:2275 msgid "Line reference" msgstr "Linjenummer" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2260 msgid "Power Tower" msgstr "Kraftmast" @@ -23736,23 +23411,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2265 msgid "Edit Power Tower" msgstr "Rediger kraftmast" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2266 msgid "tower" msgstr "" -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2266 msgid "pole" msgstr "" -#: build/trans_presets.java:2406 +#: build/trans_presets.java:2267 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2408 +#: build/trans_presets.java:2269 msgid "Power Line" msgstr "Kraftlinje" @@ -23761,79 +23436,79 @@ #. -#: build/trans_presets.java:2411 +#: build/trans_presets.java:2272 msgid "Edit Power Line" msgstr "Rediger kraftlinje" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2412 +#: build/trans_presets.java:2273 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2412 +#: build/trans_presets.java:2273 msgid "line" msgstr "" -#: build/trans_presets.java:2412 +#: build/trans_presets.java:2273 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2276 msgid "Voltage" msgstr "Spenning" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2277 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2278 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2278 msgid "single" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2278 msgid "double" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2278 msgid "triple" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2278 msgid "quad" msgstr "" -#: build/trans_presets.java:2420 +#: build/trans_presets.java:2281 msgid "Amenities" msgstr "Fasiliteter" #. group "Amenities" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2282 msgid "Toilets" msgstr "Toaletter" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2289 msgid "limited" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2429 build/trans_presets.java:2559 +#: build/trans_presets.java:2290 build/trans_presets.java:2420 msgid "Note" msgstr "Kommentar" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2292 msgid "Post Box" msgstr "Postkasse" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2297 msgid "Telephone" msgstr "Telefon" @@ -23842,5 +23517,5 @@ #. -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2300 msgid "Edit Telephone" msgstr "Rediger telefon" @@ -23848,5 +23523,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2442 build/trans_presets.java:2560 +#: build/trans_presets.java:2303 build/trans_presets.java:2421 msgid "Coins" msgstr "Mynter" @@ -23854,5 +23529,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2443 build/trans_presets.java:2561 +#: build/trans_presets.java:2304 build/trans_presets.java:2422 msgid "Notes" msgstr "Sedler" @@ -23860,5 +23535,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2444 build/trans_presets.java:2562 +#: build/trans_presets.java:2305 build/trans_presets.java:2423 msgid "Electronic purses and Charge cards" msgstr "Elektronisk lommebok eller betalingskort" @@ -23866,5 +23541,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2445 build/trans_presets.java:2563 +#: build/trans_presets.java:2306 build/trans_presets.java:2424 msgid "Debit cards" msgstr "Bankkort" @@ -23872,15 +23547,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2446 build/trans_presets.java:2564 +#: build/trans_presets.java:2307 build/trans_presets.java:2425 msgid "Credit cards" msgstr "Kredittkort" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2308 msgid "Telephone cards" msgstr "Telefonkort" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2310 msgid "Recycling" msgstr "Returstasjon" @@ -23889,5 +23564,5 @@ #. -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2313 msgid "Edit Recycling station" msgstr "Rediger returstasjon" @@ -23895,30 +23570,30 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2315 msgid "Batteries" msgstr "Batterier" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2455 +#: build/trans_presets.java:2316 msgid "Cans" msgstr "Bokser" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2456 +#: build/trans_presets.java:2317 msgid "Clothes" msgstr "Klær" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2318 msgid "Glass" msgstr "Glass" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2458 +#: build/trans_presets.java:2319 msgid "Paper" msgstr "Papir" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2320 msgid "Scrap Metal" msgstr "Metall" @@ -23927,31 +23602,31 @@ #. #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2325 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2326 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2326 msgid "stone" msgstr "" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2326 msgid "plastic" msgstr "" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2327 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2327 msgid "black" msgstr "" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2327 msgid "brown" msgstr "" @@ -23961,7 +23636,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23971,5 +23646,5 @@ #. 50000 #. -#. +#. #. #. @@ -23979,5 +23654,5 @@ #. 50000 #. -#. +#. #. #. @@ -23987,5 +23662,5 @@ #. 50000 #. -#. +#. #. #. @@ -23995,5 +23670,5 @@ #. 50000 #. -#. +#. #. #. @@ -24003,5 +23678,5 @@ #. 50000 #. -#. +#. #. #. @@ -24011,5 +23686,5 @@ #. 50000 #. -#. +#. #. #. @@ -24019,5 +23694,5 @@ #. 50000 #. -#. +#. #. #. @@ -24027,42 +23702,42 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_presets.java:2466 build/trans_style.java:3126 -#: build/trans_style.java:3134 build/trans_style.java:3142 -#: build/trans_style.java:3150 build/trans_style.java:3158 -#: build/trans_style.java:3205 build/trans_style.java:3213 -#: build/trans_style.java:3311 build/trans_style.java:3319 +#: build/trans_presets.java:2327 build/trans_style.java:3157 +#: build/trans_style.java:3165 build/trans_style.java:3173 +#: build/trans_style.java:3181 build/trans_style.java:3189 +#: build/trans_style.java:3236 build/trans_style.java:3244 +#: build/trans_style.java:3342 build/trans_style.java:3350 msgid "green" msgstr "grønn" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2327 msgid "red" msgstr "" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2327 msgid "blue" msgstr "" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2327 msgid "gray" msgstr "" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2327 msgid "white" msgstr "" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2328 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2330 msgid "Hunting Stand" msgstr "Jaktpost" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2331 msgid "Edit Hunting Stand" msgstr "Rediger jaktpost" @@ -24071,30 +23746,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2472 build/trans_presets.java:2948 +#: build/trans_presets.java:2333 build/trans_presets.java:2809 msgid "Height" msgstr "Høyde" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2333 msgid "low" msgstr "lav" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2333 msgid "half" msgstr "halv" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2333 msgid "full" msgstr "full" -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2335 msgid "Hide" msgstr "Skjul" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2336 msgid "Lock" msgstr "Lås" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2338 msgid "Fountain" msgstr "Fontene" @@ -24103,10 +23778,10 @@ #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2341 msgid "Edit Fountain" msgstr "Rediger fontene" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2345 msgid "Drinking Water" msgstr "Drikkevann" @@ -24115,10 +23790,10 @@ #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2348 msgid "Edit Drinking Water" msgstr "Rediger drikkevann" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2491 +#: build/trans_presets.java:2352 msgid "Baby Hatch" msgstr "Stellebord" @@ -24126,15 +23801,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2354 msgid "Edit Baby Hatch" msgstr "Rediger stellebord" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2360 msgid "Shops" msgstr "Butikker" #. group "Shops" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2361 msgid "Car Dealer" msgstr "" @@ -24142,10 +23817,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2363 msgid "Edit Car Shop" msgstr "Rediger bilforretning" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2507 +#: build/trans_presets.java:2368 msgid "Bike Dealer" msgstr "" @@ -24154,28 +23829,28 @@ #. -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2371 msgid "Edit Bicycle Shop" msgstr "Rediger sykkelbutikk" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2514 +#: build/trans_presets.java:2375 msgid "Supermarket" msgstr "Supermarked" #. item "Shops/Supermarket" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2376 msgid "Edit Supermarket" msgstr "Rediger supermarked" -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2381 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2382 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2387 msgid "Convenience Store" msgstr "Minimarked" @@ -24183,9 +23858,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2389 msgid "Edit Convenience Store" msgstr "Rediger Minimarked" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2394 msgid "Kiosk" msgstr "Kiosk" @@ -24193,27 +23868,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2396 msgid "Edit Kiosk" msgstr "Rediger kiosk" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2401 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2402 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2407 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2547 +#: build/trans_presets.java:2408 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2413 msgid "Vending machine" msgstr "Automat" @@ -24221,5 +23896,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2415 msgid "Edit Vending machine" msgstr "Rediger automat" @@ -24227,88 +23902,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "Vending products" msgstr "Automatprodukter" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "public_transport_tickets" msgstr "billetter" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "public_transport_plans" msgstr "buss-, trikk- og togkart" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "parking_tickets" msgstr "parkeringsbillett" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "food" msgstr "mat" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "drinks" msgstr "drikke" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "sweets" msgstr "godter" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "cigarettes" msgstr "sigaretter" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "photos" msgstr "foto" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "animal_food" msgstr "dyremat" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "news_papers" msgstr "aviser" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "toys" msgstr "leker" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "stamps" msgstr "frimerke" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "SIM-cards" msgstr "SIM-kort" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "telephone_vouchers" msgstr "telefonkort" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "vouchers" msgstr "sedler" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "condoms" msgstr "kondomer" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "tampons" msgstr "tamponger" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2417 msgid "excrement_bags" msgstr "hundeposer" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2426 msgid "Account or loyalty cards" msgstr "kundekort" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2428 msgid "Butcher" msgstr "Slakter" @@ -24316,9 +23991,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2430 msgid "Edit Butcher" msgstr "Rediger slakter" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2435 msgid "Baker" msgstr "Baker" @@ -24326,9 +24001,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2437 msgid "Edit Baker" msgstr "Rediger baker" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2442 msgid "Florist" msgstr "Blomster" @@ -24336,18 +24011,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2444 msgid "Edit Florist" msgstr "Rediger blomster" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2449 msgid "Organic" msgstr "Økologisk" #. item "Shops/Organic" -#: build/trans_presets.java:2589 +#: build/trans_presets.java:2450 msgid "Edit Organic Shop" msgstr "Rediger økologisk" -#: build/trans_presets.java:2594 +#: build/trans_presets.java:2455 msgid "Alcohol" msgstr "Sprit og vin" @@ -24355,54 +24030,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2596 +#: build/trans_presets.java:2457 msgid "Edit Alcohol Shop" msgstr "Rediger sprit og vin" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2462 msgid "Beverages" msgstr "Drikke" #. item "Shops/Beverages" -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2463 msgid "Edit Beverages Shop" msgstr "Rediger drikke" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2468 msgid "Computer" msgstr "Dataelektronikk" #. item "Shops/Computer" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2469 msgid "Edit Computer Shop" msgstr "Rediger dataelektronikk" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2474 msgid "Electronics" msgstr "Elektronikk" #. item "Shops/Electronics" -#: build/trans_presets.java:2614 +#: build/trans_presets.java:2475 msgid "Edit Electronics Shop" msgstr "Rediger elektronikk" -#: build/trans_presets.java:2619 +#: build/trans_presets.java:2480 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2481 msgid "Edit Hifi Shop" msgstr "Rediger hifi" -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2486 msgid "Furniture" msgstr "Møbler" #. item "Shops/Furniture" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2487 msgid "Edit Furniture Shop" msgstr "Rediger møbler" -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2492 msgid "Garden Centre" msgstr "Hagesenter" @@ -24410,9 +24085,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2494 msgid "Edit Garden Centre" msgstr "Rediger hagesenter" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2499 msgid "Hardware" msgstr "Jernvarehandel" @@ -24420,9 +24095,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2640 +#: build/trans_presets.java:2501 msgid "Edit Hardware Store" msgstr "Rediger jernvarehandel" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2506 msgid "Do-it-yourself-store" msgstr "Byggevare" @@ -24430,54 +24105,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2647 +#: build/trans_presets.java:2508 msgid "Edit Do-it-yourself-store" msgstr "Rediger byggevare" -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2513 msgid "Stationery" msgstr "Kontor" #. item "Shops/Stationery" -#: build/trans_presets.java:2653 +#: build/trans_presets.java:2514 msgid "Edit Stationery Shop" msgstr "Rediger kontor" -#: build/trans_presets.java:2658 +#: build/trans_presets.java:2519 msgid "Hairdresser" msgstr "Frisør" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2520 msgid "Edit Hairdresser" msgstr "Rediger frisør" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2525 msgid "Shoes" msgstr "Sko" #. item "Shops/Shoes" -#: build/trans_presets.java:2665 +#: build/trans_presets.java:2526 msgid "Edit Shoe Shop" msgstr "Rediger sko" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2531 msgid "Toys" msgstr "Leker" #. item "Shops/Toys" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2532 msgid "Edit Toy Shop" msgstr "Rediger leker" -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2537 msgid "Video" msgstr "Video" #. item "Shops/Video" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2538 msgid "Edit Video Shop" msgstr "Rediger video" -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2543 msgid "Dry Cleaning" msgstr "Renseri" @@ -24485,9 +24160,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2545 msgid "Edit Dry Cleaning" msgstr "Rediger renseri" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2550 msgid "Laundry" msgstr "Vaskeri" @@ -24495,9 +24170,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2691 +#: build/trans_presets.java:2552 msgid "Edit Laundry" msgstr "Rediger vaskeri" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2557 msgid "Outdoor" msgstr "Friluftsutstyr" @@ -24505,28 +24180,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2698 +#: build/trans_presets.java:2559 msgid "Edit Outdoor Shop" msgstr "Rediger friluftsutstyr" #. item "Shops/Sports" -#: build/trans_presets.java:2704 +#: build/trans_presets.java:2565 msgid "Edit Sports Shop" msgstr "Rediger sport" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2570 msgid "Optician" msgstr "Optiker" #. item "Shops/Optician" -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2571 msgid "Edit Optician" msgstr "Rediger optiker" -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2578 msgid "Cash" msgstr "Valuta" #. group "Cash" -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2579 msgid "Bank" msgstr "Bank" @@ -24534,14 +24209,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2720 +#: build/trans_presets.java:2581 msgid "Edit Bank" msgstr "Rediger bank" -#: build/trans_presets.java:2725 build/trans_presets.java:2734 +#: build/trans_presets.java:2586 build/trans_presets.java:2595 msgid "Automated Teller Machine" msgstr "Minibank" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2588 msgid "Money Exchange" msgstr "Veksle valuta" @@ -24549,5 +24224,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2590 msgid "Edit Money Exchange" msgstr "Rediger valutaveksling" @@ -24555,15 +24230,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2736 +#: build/trans_presets.java:2597 msgid "Edit Automated Teller Machine" msgstr "Rediger minibank" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2741 +#: build/trans_presets.java:2602 msgid "Health" msgstr "Helse" #. group "Health" -#: build/trans_presets.java:2742 +#: build/trans_presets.java:2603 msgid "Doctors" msgstr "Lege" @@ -24571,18 +24246,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2605 msgid "Edit Doctors" msgstr "Rediger lege" -#: build/trans_presets.java:2749 +#: build/trans_presets.java:2610 msgid "Dentist" msgstr "Tannlege" #. item "Health/Dentist" -#: build/trans_presets.java:2750 +#: build/trans_presets.java:2611 msgid "Edit Dentist" msgstr "Rediger tannlege" -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2616 msgid "Pharmacy" msgstr "Apotek" @@ -24590,5 +24265,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2618 msgid "Edit Pharmacy" msgstr "Rediger apotek" @@ -24596,9 +24271,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2620 msgid "Dispensing" msgstr "Reseptlevering" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2624 msgid "Hospital" msgstr "Sykehus" @@ -24606,10 +24281,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2626 msgid "Edit Hospital" msgstr "Rediger sykehus" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2630 msgid "Emergency Access Point" msgstr "Redningsmøtepunkt" @@ -24618,5 +24293,5 @@ #. -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2633 msgid "Edit Emergency Access Point" msgstr "Rediger redningsmøtepunkt" @@ -24625,20 +24300,20 @@ #. #. -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2636 msgid "Point Number" msgstr "Punktnummer" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2637 msgid "Point Name" msgstr "Navn på punkt" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2639 msgid "Phone Number" msgstr "Telefonnummer" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2779 +#: build/trans_presets.java:2640 msgid "(Use international code, like +12-345-67890)" msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)" @@ -24646,5 +24321,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2643 msgid "Veterinary" msgstr "Veterinær" @@ -24653,64 +24328,64 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2646 msgid "Edit Veterinary" msgstr "Rediger veterinær" -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2653 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2654 msgid "Places" msgstr "Steder" #. group "Geography/Places" -#: build/trans_presets.java:2794 +#: build/trans_presets.java:2655 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2795 +#: build/trans_presets.java:2656 msgid "Edit Continent" msgstr "Rediger kontinent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2800 +#: build/trans_presets.java:2661 msgid "Country" msgstr "Land" #. item "Geography/Places/Country" -#: build/trans_presets.java:2801 +#: build/trans_presets.java:2662 msgid "Edit Country" msgstr "Rediger land" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2667 msgid "State" msgstr "Delstat/provins" #. item "Geography/Places/State" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2668 msgid "Edit State" msgstr "Rediger delstat/provins" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2673 msgid "Region" msgstr "Region" #. item "Geography/Places/Region" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2674 msgid "Edit Region" msgstr "Rediger region (fylke)" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2679 msgid "County" msgstr "Kommune" #. item "Geography/Places/County" -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2680 msgid "Edit County" msgstr "Rediger kommune" @@ -24718,15 +24393,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2825 +#: build/trans_presets.java:2686 msgid "City" msgstr "Storby" #. item "Geography/Places/City" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2687 msgid "Edit City" msgstr "Rediger storby" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2692 msgid "Town" msgstr "By" @@ -24734,10 +24409,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2694 msgid "Edit Town" msgstr "Rediger by" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2838 +#: build/trans_presets.java:2699 msgid "Suburb" msgstr "Forstad/bydel" @@ -24745,25 +24420,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2701 msgid "Edit Suburb" msgstr "Rediger forstad/bydel" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2845 +#: build/trans_presets.java:2706 msgid "Village" msgstr "Landsby" #. item "Geography/Places/Village" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2707 msgid "Edit Village" msgstr "Rediger landsby" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2712 msgid "Hamlet" msgstr "Grend" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2713 msgid "Edit Hamlet" msgstr "Rediger grend" @@ -24771,5 +24446,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2719 msgid "Locality" msgstr "Lokalitet" @@ -24777,10 +24452,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2721 msgid "Edit Locality" msgstr "Rediger lokalitet" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2726 msgid "Island" msgstr "Øy" @@ -24788,10 +24463,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2728 msgid "Edit Island" msgstr "Rediger øy" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2733 msgid "Islet" msgstr "" @@ -24799,5 +24474,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2735 msgid "Edit Islet" msgstr "" @@ -24805,5 +24480,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2741 msgid "Cave Entrance" msgstr "Huleinngang" @@ -24811,10 +24486,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2743 msgid "Edit Cave Entrance" msgstr "Rediger huleinngang" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2747 msgid "Peak" msgstr "Fjelltopp" @@ -24822,10 +24497,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2888 +#: build/trans_presets.java:2749 msgid "Edit Peak" msgstr "Rediger fjelltopp" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2893 +#: build/trans_presets.java:2754 msgid "Glacier" msgstr "Isbre" @@ -24833,10 +24508,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2756 msgid "Edit Glacier" msgstr "Rediger isbre" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2761 msgid "Volcano" msgstr "Vulkan" @@ -24844,70 +24519,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2763 msgid "Edit Volcano" msgstr "Rediger vulkan" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2769 msgid "Boundaries" msgstr "Grenser" #. group "Boundaries" -#: build/trans_presets.java:2909 +#: build/trans_presets.java:2770 msgid "National" msgstr "Nasjonal" #. item "Boundaries/National" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2771 msgid "Edit National Boundary" msgstr "Rediger landegrense" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2915 +#: build/trans_presets.java:2776 msgid "Administrative" msgstr "Fylkesgrense" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2777 msgid "Edit Administrative Boundary" msgstr "Rediger fylkesgrense" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2921 +#: build/trans_presets.java:2782 msgid "Civil" msgstr "Kommunegrense" #. item "Boundaries/Civil" -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2783 msgid "Edit Civil Boundary" msgstr "Rediger kommunegrense" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2788 msgid "Political" msgstr "Politisk" #. item "Boundaries/Political" -#: build/trans_presets.java:2928 +#: build/trans_presets.java:2789 msgid "Edit Political Boundary" msgstr "Rediger politisk grense" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2933 +#: build/trans_presets.java:2794 msgid "National park" msgstr "Nasjonalpark" #. item "Boundaries/National park" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2795 msgid "Edit National Park Boundary" msgstr "Rediger nasjonalparkgrense" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2801 msgid "Land use" msgstr "Bruk av grunn" #. group "Land use" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2802 msgid "Tree" msgstr "Tre" @@ -24916,15 +24591,15 @@ #. -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2805 msgid "Edit Tree" msgstr "Rediger tre" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2810 msgid "Botanical Name" msgstr "Botanisk navn" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2812 msgid "Wood" msgstr "Skogsområde" @@ -24933,5 +24608,5 @@ #. -#: build/trans_presets.java:2954 +#: build/trans_presets.java:2815 msgid "Edit Wood" msgstr "Rediger skogsområde" @@ -24939,17 +24614,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2957 build/trans_presets.java:2966 +#: build/trans_presets.java:2818 build/trans_presets.java:2827 msgid "coniferous" msgstr "barskog" -#: build/trans_presets.java:2957 build/trans_presets.java:2966 +#: build/trans_presets.java:2818 build/trans_presets.java:2827 msgid "deciduous" msgstr "løvskog" -#: build/trans_presets.java:2957 build/trans_presets.java:2966 +#: build/trans_presets.java:2818 build/trans_presets.java:2827 msgid "mixed" msgstr "blandingsskog" -#: build/trans_presets.java:2959 +#: build/trans_presets.java:2820 msgid "Forest" msgstr "Skog" @@ -24958,14 +24633,14 @@ #. -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2823 msgid "Edit Forest Landuse" msgstr "Rediger skog" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2829 msgid "Nature Reserve" msgstr "Naturreservat" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2830 msgid "Edit Nature Reserve" msgstr "Rediger naturreservat" @@ -24973,25 +24648,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2835 msgid "Scree" msgstr "Steinur" #. item "Land use/Scree" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2836 msgid "Edit Scree" msgstr "Rediger steinur" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:2840 msgid "Scrub" msgstr "Krattskog" #. item "Land use/Scrub" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2841 msgid "Edit Scrub" msgstr "Rediger krattskog" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2984 +#: build/trans_presets.java:2845 msgid "Fell" msgstr "Fjell" @@ -24999,10 +24674,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2847 msgid "Edit Fell" msgstr "Rediger fjell" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:2851 msgid "Heath" msgstr "Beite" @@ -25010,5 +24685,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2853 msgid "Edit Heath" msgstr "Rediger beite" @@ -25016,5 +24691,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2997 +#: build/trans_presets.java:2858 msgid "Farmyard" msgstr "Gårdstun" @@ -25023,45 +24698,45 @@ #. -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2861 msgid "Edit Farmyard Landuse" msgstr "Rediger gårdstun" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:2866 msgid "Farmland" msgstr "Åkerland" #. item "Land use/Farmland" -#: build/trans_presets.java:3006 +#: build/trans_presets.java:2867 msgid "Edit Farmland Landuse" msgstr "Rediger åkerland" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3011 +#: build/trans_presets.java:2872 msgid "Meadow" msgstr "Eng" #. item "Land use/Meadow" -#: build/trans_presets.java:3012 +#: build/trans_presets.java:2873 msgid "Edit Meadow Landuse" msgstr "Rediger eng" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3017 +#: build/trans_presets.java:2878 msgid "Vineyard" msgstr "Vingård" #. item "Land use/Vineyard" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:2879 msgid "Edit Vineyard Landuse" msgstr "Rediger vingård" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3023 +#: build/trans_presets.java:2884 msgid "Allotments" msgstr "Hageparseller" #. item "Land use/Allotments" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:2885 msgid "Edit Allotments Landuse" msgstr "Rediger hageparseller" @@ -25069,25 +24744,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3030 +#: build/trans_presets.java:2891 msgid "Garden" msgstr "Hage" #. item "Land use/Garden" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:2892 msgid "Edit Garden" msgstr "Rediger hage" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3035 +#: build/trans_presets.java:2896 msgid "Grass" msgstr "Gress" #. item "Land use/Grass" -#: build/trans_presets.java:3036 +#: build/trans_presets.java:2897 msgid "Edit Grass Landuse" msgstr "Rediger gress" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:2902 msgid "Village Green" msgstr "Friområde" @@ -25095,10 +24770,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3043 +#: build/trans_presets.java:2904 msgid "Edit Village Green Landuse" msgstr "Rediger friområde" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3048 +#: build/trans_presets.java:2909 msgid "Common" msgstr "Offentlig" @@ -25106,20 +24781,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3050 +#: build/trans_presets.java:2911 msgid "Edit Common" msgstr "Rediger offentlig" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2915 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:2916 msgid "Edit Park" msgstr "Rediger park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:2920 msgid "Recreation Ground" msgstr "Friluftsområde" @@ -25127,5 +24802,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:2922 msgid "Edit Recreation Ground Landuse" msgstr "Rediger friluftsområde" @@ -25133,15 +24808,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3067 +#: build/trans_presets.java:2928 msgid "Residential area" msgstr "Boligområde" #. item "Land use/Residential area" -#: build/trans_presets.java:3068 +#: build/trans_presets.java:2929 msgid "Edit Residential Landuse" msgstr "Rediger boligområde" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3073 +#: build/trans_presets.java:2934 msgid "Graveyard" msgstr "Gravlund" @@ -25149,9 +24824,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3075 +#: build/trans_presets.java:2936 msgid "Edit Graveyard" msgstr "Rediger gravlund" -#: build/trans_presets.java:3081 +#: build/trans_presets.java:2942 msgid "Cemetery" msgstr "Kirkegård" @@ -25159,39 +24834,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2944 msgid "Edit Cemetery Landuse" msgstr "Rediger kirkegård" -#: build/trans_presets.java:3090 +#: build/trans_presets.java:2951 msgid "Retail" msgstr "Forretninger" #. item "Land use/Retail" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:2952 msgid "Edit Retail Landuse" msgstr "Rediger forretninger" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3096 +#: build/trans_presets.java:2957 msgid "Commercial" msgstr "Næringsområde" #. item "Land use/Commercial" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:2958 msgid "Edit Commercial Landuse" msgstr "Rediger næringsområde" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:2963 msgid "Industrial" msgstr "Industriområde" #. item "Land use/Industrial" -#: build/trans_presets.java:3103 +#: build/trans_presets.java:2964 msgid "Edit Industrial Landuse" msgstr "Rediger industriområde" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3108 +#: build/trans_presets.java:2969 msgid "Railway land" msgstr "Jernbanegrunn" @@ -25199,15 +24874,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3110 +#: build/trans_presets.java:2971 msgid "Edit Railway Landuse" msgstr "Rediger jernbanegrunn" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:2976 msgid "Military" msgstr "Millitært" #. item "Land use/Military" -#: build/trans_presets.java:3116 +#: build/trans_presets.java:2977 msgid "Edit Military Landuse" msgstr "Rediger millitært" @@ -25215,50 +24890,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2983 msgid "Construction area" msgstr "Byggeplass" #. item "Land use/Construction area" -#: build/trans_presets.java:3123 +#: build/trans_presets.java:2984 msgid "Edit Construction Landuse" msgstr "Rediger byggeplass" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3128 +#: build/trans_presets.java:2989 msgid "Brownfield" msgstr "Rivningsområde" #. item "Land use/Brownfield" -#: build/trans_presets.java:3129 +#: build/trans_presets.java:2990 msgid "Edit Brownfield Landuse" msgstr "Rediger rivningsområde" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3134 +#: build/trans_presets.java:2995 msgid "Greenfield" msgstr "Byggeområde" #. item "Land use/Greenfield" -#: build/trans_presets.java:3135 +#: build/trans_presets.java:2996 msgid "Edit Greenfield Landuse" msgstr "Rediger byggeområde" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3140 +#: build/trans_presets.java:3001 msgid "Landfill" msgstr "Avfallsdeponi" #. item "Land use/Landfill" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3002 msgid "Edit Landfill Landuse" msgstr "Rediger avfallsdeponi" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3146 +#: build/trans_presets.java:3007 msgid "Quarry" msgstr "Steinbrudd" #. item "Land use/Quarry" -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3008 msgid "Edit Quarry Landuse" msgstr "Rediger steinbrudd" @@ -25268,5 +24943,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3160 +#: build/trans_presets.java:3021 msgid "Edit Multipolygon" msgstr "Rediger multipolygon" @@ -25275,10 +24950,10 @@ #. #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3027 msgid "outer segment" msgstr "ytre linjesegment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3167 +#: build/trans_presets.java:3028 msgid "inner segment" msgstr "indre linjesegment" @@ -25286,5 +24961,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3170 +#: build/trans_presets.java:3031 msgid "Turn restriction" msgstr "Svingeforbud" @@ -25293,5 +24968,5 @@ #. -#: build/trans_presets.java:3173 +#: build/trans_presets.java:3034 msgid "Edit Turn Restriction" msgstr "Rediger svingeforbud" @@ -25299,34 +24974,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3036 msgid "Restriction" msgstr "Forbud" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3036 msgid "no_left_turn" msgstr "venstresving forbudt" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3036 msgid "no_right_turn" msgstr "høyresving forbudt" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3036 msgid "no_straight_on" msgstr "rett frem forbudt" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3036 msgid "no_u_turn" msgstr "u-sving forbudt" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3036 msgid "only_right_turn" msgstr "påbudt høyresving" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3036 msgid "only_left_turn" msgstr "påbudt venstresving" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3036 msgid "only_straight_on" msgstr "påbudt rett frem" @@ -25335,15 +25010,15 @@ #. #. -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3041 msgid "from way" msgstr "fra linje" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3042 msgid "via node or way" msgstr "via node eller linje" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3182 +#: build/trans_presets.java:3043 msgid "to way" msgstr "til linje" @@ -25351,5 +25026,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3185 +#: build/trans_presets.java:3046 msgid "Route" msgstr "Rute" @@ -25358,5 +25033,5 @@ #. -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3049 msgid "Edit Route" msgstr "Rediger rute" @@ -25364,5 +25039,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3051 msgid "Route type" msgstr "Rutetype" @@ -25374,5 +25049,5 @@ #. 40000 #. -#. +#. #. #. @@ -25388,5 +25063,5 @@ #. 30000 #. -#. +#. #. #. @@ -25396,5 +25071,5 @@ #. 10000 #. -#. +#. #. #. @@ -25405,5 +25080,5 @@ #. 50000 #. -#. +#. #. #. @@ -25416,7 +25091,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25426,5 +25101,5 @@ #. 50000 #. -#. +#. #. #. @@ -25434,5 +25109,5 @@ #. 50000 #. -#. +#. #. #. @@ -25442,5 +25117,5 @@ #. 50000 #. -#. +#. #. #. @@ -25450,8 +25125,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_presets.java:3190 build/trans_style.java:233 +#: build/trans_presets.java:3051 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:732 build/trans_style.java:909 @@ -25461,17 +25136,17 @@ msgstr "sykkel" -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3051 msgid "bus" msgstr "buss" -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3051 msgid "road" msgstr "vei" -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3051 msgid "ferry" msgstr "ferge" -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3051 msgid "ski" msgstr "ski" @@ -25482,5 +25157,5 @@ #. 50000 #. -#. +#. #. #. @@ -25496,5 +25171,5 @@ #. 50000 #. -#. +#. #. #. @@ -25504,5 +25179,5 @@ #. 10000 #. -#. +#. #. #. @@ -25511,5 +25186,5 @@ #. 50000 #. -#. +#. #. #. @@ -25519,5 +25194,5 @@ #. 50000 #. -#. +#. #. #. @@ -25528,8 +25203,8 @@ #. 10000 #. -#. +#. #. #. -#: build/trans_presets.java:3190 build/trans_style.java:247 +#: build/trans_presets.java:3051 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:723 build/trans_style.java:739 @@ -25538,13 +25213,9 @@ msgstr "fotgjenger" -#: build/trans_presets.java:3190 -msgid "hiking" -msgstr "tur" - -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3051 msgid "tram" msgstr "trikk" -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3051 msgid "detour" msgstr "omkjøring" @@ -25555,13 +25226,13 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_presets.java:3190 build/trans_style.java:1193 +#: build/trans_presets.java:3051 build/trans_style.java:1208 msgid "subway" msgstr "T-bane" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3054 msgid "Symbol description" msgstr "Symbolforklaring" @@ -25569,31 +25240,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3196 +#: build/trans_presets.java:3057 msgid "Network" msgstr "Nettverk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3059 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3059 msgid "proposed" msgstr "planlagt" -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3059 msgid "alternate" msgstr "alternativ" -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3059 msgid "temporary" msgstr "midlertidig" -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3059 msgid "connection" msgstr "forbindelse" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3060 msgid "Color (hex)" msgstr "Farge (hex)" @@ -25602,30 +25273,30 @@ #. #. -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3063 msgid "route segment" msgstr "rutesegment" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3064 msgid "forward segment" msgstr "neste segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3204 +#: build/trans_presets.java:3065 msgid "backward segment" msgstr "forrige segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3205 +#: build/trans_presets.java:3066 msgid "halt point" msgstr "stoppepunkt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3206 +#: build/trans_presets.java:3067 msgid "forward halt point" msgstr "neste stoppunkt" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3207 +#: build/trans_presets.java:3068 msgid "backward halt point" msgstr "forrige stoppunkt" @@ -25668,9 +25339,9 @@ #. 7. scale_min / scale_max #. - zoom scale for display -#. +#. #. Using both area and line attributes for the same key/value pair does work. For areas #. first the best matching area rule is searched and the best matching line rule is #. connected with it. They need not have the same key/value pair. -#. +#. #. The colours can consist of the two components - name and hex code (e.g. water#0000ff). #. If both are given, the color name is introduced in preferences with that value. If only @@ -25678,5 +25349,5 @@ #. modified preferences or previous value is used. The 6 hex digit color code can also #. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6). -#. +#. #. Linemod's are drawn over or under the line they are associated with and modify the #. appearance. There can be multiple linemod's for one way (contrary to line styles, @@ -25686,8 +25357,8 @@ #. on the sides of the way or the waystyles itself must use alpha channel (which may #. look strange). -#. +#. #. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted #. in case they have same priority! Using priority settings helps to solve conflicts. -#. +#. #. For external files the should have following elements: #. - author the author of the style @@ -25701,5 +25372,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -25707,5 +25378,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -25754,6 +25425,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -25833,5 +25504,5 @@ #. 40000 #. -#. +#. #. #. @@ -25841,16 +25512,16 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4056 +#: build/trans_style.java:633 build/trans_style.java:4087 msgid "deprecated" msgstr "uønsket" @@ -25861,5 +25532,5 @@ #. 10000 #. -#. +#. #. #. @@ -25868,5 +25539,5 @@ #. 50000 #. -#. +#. #. #. @@ -25875,5 +25546,5 @@ #. 50000 #. -#. +#. #. #. @@ -25889,5 +25560,5 @@ #. 20000 #. -#. +#. #. #. @@ -25901,5 +25572,5 @@ #. 30000 #. -#. +#. #. #. @@ -25908,5 +25579,5 @@ #. 50000 #. -#. +#. #. #. @@ -25915,5 +25586,5 @@ #. 50000 #. -#. +#. #. #. @@ -25922,5 +25593,5 @@ #. 50000 #. -#. +#. #. #. @@ -25929,5 +25600,5 @@ #. 50000 #. -#. +#. #. #. @@ -25936,5 +25607,5 @@ #. 50000 #. -#. +#. #. #. @@ -25943,5 +25614,5 @@ #. 50000 #. -#. +#. #. #. @@ -25950,5 +25621,5 @@ #. 50000 #. -#. +#. #. #. @@ -25957,5 +25628,5 @@ #. 50000 #. -#. +#. #. #. @@ -25964,5 +25635,5 @@ #. 50000 #. -#. +#. #. #. @@ -25971,5 +25642,5 @@ #. 50000 #. -#. +#. #. #. @@ -25978,5 +25649,5 @@ #. 50000 #. -#. +#. #. #. @@ -25985,5 +25656,5 @@ #. 50000 #. -#. +#. #. #. @@ -25992,5 +25663,5 @@ #. 50000 #. -#. +#. #. #. @@ -25999,5 +25670,5 @@ #. 50000 #. -#. +#. #. #. @@ -26174,7 +25845,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26188,5 +25859,5 @@ #. 40000 #. -#. +#. #. #. @@ -26196,7 +25867,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26206,5 +25877,5 @@ #. 50000 #. -#. +#. #. #. @@ -26214,5 +25885,5 @@ #. 50000 #. -#. +#. #. #. @@ -26222,5 +25893,5 @@ #. 50000 #. -#. +#. #. #. @@ -26230,5 +25901,5 @@ #. 50000 #. -#. +#. #. #. @@ -26244,5 +25915,5 @@ #. 10000 #. -#. +#. #. #. @@ -26252,5 +25923,5 @@ #. 50000 #. -#. +#. #. #. @@ -26260,5 +25931,5 @@ #. 50000 #. -#. +#. #. #. @@ -26268,5 +25939,5 @@ #. 50000 #. -#. +#. #. #. @@ -26276,5 +25947,5 @@ #. 50000 #. -#. +#. #. #. @@ -26284,5 +25955,5 @@ #. 50000 #. -#. +#. #. #. @@ -26292,5 +25963,5 @@ #. 50000 #. -#. +#. #. #. @@ -26301,12 +25972,12 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:756 build/trans_style.java:1167 -#: build/trans_style.java:1231 build/trans_style.java:1239 -#: build/trans_style.java:1248 build/trans_style.java:1256 -#: build/trans_style.java:1264 build/trans_style.java:1265 -#: build/trans_style.java:1272 +#: build/trans_style.java:756 build/trans_style.java:1182 +#: build/trans_style.java:1246 build/trans_style.java:1254 +#: build/trans_style.java:1263 build/trans_style.java:1271 +#: build/trans_style.java:1279 build/trans_style.java:1280 +#: build/trans_style.java:1287 msgid "rail" msgstr "jernbane" @@ -26317,5 +25988,5 @@ #. 10000 #. -#. +#. #. #. @@ -26324,5 +25995,5 @@ #. 50000 #. -#. +#. #. #. @@ -26332,5 +26003,5 @@ #. 50000 #. -#. +#. #. #. @@ -26339,5 +26010,5 @@ #. 50000 #. -#. +#. #. #. @@ -26346,5 +26017,5 @@ #. 50000 #. -#. +#. #. #. @@ -26353,5 +26024,5 @@ #. 50000 #. -#. +#. #. #. @@ -26360,5 +26031,5 @@ #. 50000 #. -#. +#. #. #. @@ -26367,5 +26038,5 @@ #. 40000 #. -#. +#. #. #. @@ -26374,5 +26045,5 @@ #. 50000 #. -#. +#. #. #. @@ -26381,5 +26052,5 @@ #. 50000 #. -#. +#. #. #. @@ -26388,5 +26059,5 @@ #. 50000 #. -#. +#. #. #. @@ -26395,5 +26066,5 @@ #. 50000 #. -#. +#. #. #. @@ -26407,5 +26078,5 @@ #. 50000 #. -#. +#. #. #. @@ -26419,5 +26090,5 @@ #. 50000 #. -#. +#. #. #. @@ -26426,5 +26097,5 @@ #. 50000 #. -#. +#. #. #. @@ -26438,5 +26109,5 @@ #. 50000 #. -#. +#. #. #. @@ -26451,5 +26122,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26464,5 +26135,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26476,8 +26147,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:1034 +#: build/trans_style.java:1041 msgid "dock" msgstr "tørrdokk" @@ -26488,5 +26159,5 @@ #. 50000 #. -#. +#. #. #. @@ -26495,5 +26166,5 @@ #. 50000 #. -#. +#. #. #. @@ -26502,5 +26173,5 @@ #. 50000 #. -#. +#. #. #. @@ -26510,5 +26181,5 @@ #. 50000 #. -#. +#. #. #. @@ -26517,5 +26188,5 @@ #. 50000 #. -#. +#. #. #. @@ -26524,5 +26195,5 @@ #. 50000 #. -#. +#. #. #. @@ -26531,13 +26202,13 @@ #. 50000 #. -#. +#. #. #. #. -#. color manmade -#. 1 -#. 50000 -#. -#. +#. color rapids +#. 1 +#. 50000 +#. +#. #. #. @@ -26548,5 +26219,5 @@ #. 50000 #. -#. +#. #. #. @@ -26556,7 +26227,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26566,5 +26237,5 @@ #. 50000 #. -#. +#. #. #. @@ -26574,5 +26245,5 @@ #. 50000 #. -#. +#. #. #. @@ -26582,5 +26253,5 @@ #. 50000 #. -#. +#. #. #. @@ -26591,5 +26262,5 @@ #. 50000 #. -#. +#. #. #. @@ -26598,5 +26269,5 @@ #. 50000 #. -#. +#. #. #. @@ -26606,5 +26277,5 @@ #. 50000 #. -#. +#. #. #. @@ -26614,5 +26285,5 @@ #. 50000 #. -#. +#. #. #. @@ -26622,5 +26293,5 @@ #. 50000 #. -#. +#. #. #. @@ -26630,5 +26301,5 @@ #. 50000 #. -#. +#. #. #. @@ -26638,5 +26309,5 @@ #. 50000 #. -#. +#. #. #. @@ -26646,5 +26317,5 @@ #. 50000 #. -#. +#. #. #. @@ -26654,5 +26325,5 @@ #. 50000 #. -#. +#. #. #. @@ -26662,28 +26333,50 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:1057 build/trans_style.java:1086 -#: build/trans_style.java:1094 build/trans_style.java:1095 -#: build/trans_style.java:1103 build/trans_style.java:1580 -#: build/trans_style.java:1587 build/trans_style.java:1596 -#: build/trans_style.java:1604 build/trans_style.java:1636 -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1667 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1692 build/trans_style.java:1700 +#. color manmade +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1064 build/trans_style.java:1093 +#: build/trans_style.java:1109 build/trans_style.java:1110 +#: build/trans_style.java:1118 build/trans_style.java:1603 +#: build/trans_style.java:1610 build/trans_style.java:1619 +#: build/trans_style.java:1627 build/trans_style.java:1659 +#: build/trans_style.java:1667 build/trans_style.java:1675 +#: build/trans_style.java:1683 build/trans_style.java:1690 +#: build/trans_style.java:1699 build/trans_style.java:1707 +#: build/trans_style.java:1715 build/trans_style.java:1723 +#: build/trans_style.java:1731 msgid "manmade" msgstr "menneskeskapt" #. color manmade +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1101 +#, fuzzy +msgid "rapids" +msgstr "baptist" + +#. color manmade #. #. 1 #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26693,5 +26386,5 @@ #. 50000 #. -#. +#. #. #. @@ -26700,5 +26393,5 @@ #. 50000 #. -#. +#. #. #. @@ -26708,5 +26401,5 @@ #. 50000 #. -#. +#. #. #. @@ -26715,5 +26408,5 @@ #. 50000 #. -#. +#. #. #. @@ -26723,5 +26416,5 @@ #. 50000 #. -#. +#. #. #. @@ -26731,10 +26424,10 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:1113 build/trans_style.java:1128 -#: build/trans_style.java:1143 build/trans_style.java:1151 -#: build/trans_style.java:1159 +#: build/trans_style.java:1128 build/trans_style.java:1143 +#: build/trans_style.java:1158 build/trans_style.java:1166 +#: build/trans_style.java:1174 msgid "railwaypoint" msgstr "jernbanepunkt" @@ -26745,5 +26438,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26754,13 +26447,13 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:1176 build/trans_style.java:1185 +#: build/trans_style.java:1191 build/trans_style.java:1200 msgid "otherrail" msgstr "annen bane" #. color otherrail -#: build/trans_style.java:1177 +#: build/trans_style.java:1192 msgid "railover" msgstr "jernbanebro" @@ -26771,5 +26464,5 @@ #. 50000 #. -#. +#. #. #. @@ -26779,5 +26472,5 @@ #. 50000 #. -#. +#. #. #. @@ -26790,5 +26483,5 @@ #. 50000 #. -#. +#. #. #. @@ -26796,7 +26489,7 @@ #. #. color oldrail -#: build/trans_style.java:1201 build/trans_style.java:1211 -#: build/trans_style.java:1212 build/trans_style.java:1222 -#: build/trans_style.java:1223 +#: build/trans_style.java:1216 build/trans_style.java:1226 +#: build/trans_style.java:1227 build/trans_style.java:1237 +#: build/trans_style.java:1238 msgid "oldrail" msgstr "nedlagt bane" @@ -26807,5 +26500,5 @@ #. 50000 #. -#. +#. #. #. @@ -26814,5 +26507,5 @@ #. 50000 #. -#. +#. #. #. @@ -26821,5 +26514,5 @@ #. 50000 #. -#. +#. #. #. @@ -26828,7 +26521,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26839,9 +26532,9 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:1303 build/trans_style.java:1304 -#: build/trans_style.java:1336 +#: build/trans_style.java:1318 build/trans_style.java:1319 +#: build/trans_style.java:1351 msgid "aeroway" msgstr "aeroway" @@ -26852,8 +26545,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:1312 +#: build/trans_style.java:1327 msgid "terminal" msgstr "stasjon" @@ -26864,5 +26557,5 @@ #. 50000 #. -#. +#. #. #. @@ -26872,8 +26565,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:1320 build/trans_style.java:1328 +#: build/trans_style.java:1335 build/trans_style.java:1343 msgid "aeroway_dark" msgstr "aeroway_dark" @@ -26884,8 +26577,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:1344 +#: build/trans_style.java:1359 msgid "aeroway_light" msgstr "aeroway_light" @@ -26896,5 +26589,5 @@ #. 50000 #. -#. +#. #. #. @@ -26903,5 +26596,5 @@ #. 50000 #. -#. +#. #. #. @@ -26910,7 +26603,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26920,5 +26613,5 @@ #. 50000 #. -#. +#. #. #. @@ -26928,5 +26621,5 @@ #. 50000 #. -#. +#. #. #. @@ -26936,5 +26629,5 @@ #. 50000 #. -#. +#. #. #. @@ -26944,25 +26637,33 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:1368 build/trans_style.java:1376 -#: build/trans_style.java:1384 build/trans_style.java:1392 -#: build/trans_style.java:1400 +#. color aerialway +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:1383 build/trans_style.java:1391 +#: build/trans_style.java:1399 build/trans_style.java:1407 +#: build/trans_style.java:1415 build/trans_style.java:1423 msgid "aerialway" msgstr "aerialway" #. color aerialway -#. -#. 1 -#. 50000 -#. -#. +#. +#. 1 +#. 50000 +#. +#. #. -#. +#. #. #. #. color piste_easy -#: build/trans_style.java:1410 build/trans_style.java:1411 +#: build/trans_style.java:1433 build/trans_style.java:1434 msgid "piste_easy" msgstr "nedfart enkel" @@ -26973,9 +26674,9 @@ #. 30000 #. -#. +#. #. #. #. color piste_intermediate -#: build/trans_style.java:1419 build/trans_style.java:1420 +#: build/trans_style.java:1442 build/trans_style.java:1443 msgid "piste_intermediate" msgstr "nedfart middels" @@ -26986,9 +26687,9 @@ #. 30000 #. -#. +#. #. #. #. color piste_advanced -#: build/trans_style.java:1428 build/trans_style.java:1429 +#: build/trans_style.java:1451 build/trans_style.java:1452 msgid "piste_advanced" msgstr "nedfart avansert" @@ -26999,9 +26700,9 @@ #. 30000 #. -#. +#. #. #. #. color piste_expert -#: build/trans_style.java:1437 build/trans_style.java:1438 +#: build/trans_style.java:1460 build/trans_style.java:1461 msgid "piste_expert" msgstr "nedfart ekspert" @@ -27012,9 +26713,9 @@ #. 30000 #. -#. +#. #. #. #. color piste_freeride -#: build/trans_style.java:1446 build/trans_style.java:1447 +#: build/trans_style.java:1469 build/trans_style.java:1470 msgid "piste_freeride" msgstr "nedfart friløp" @@ -27025,9 +26726,9 @@ #. 30000 #. -#. +#. #. #. #. color piste_novice -#: build/trans_style.java:1455 build/trans_style.java:1456 +#: build/trans_style.java:1478 build/trans_style.java:1479 msgid "piste_novice" msgstr "nedfart nybegynner" @@ -27038,7 +26739,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -27048,5 +26749,5 @@ #. 50000 #. -#. +#. #. #. @@ -27055,5 +26756,5 @@ #. 50000 #. -#. +#. #. #. @@ -27063,5 +26764,5 @@ #. 50000 #. -#. +#. #. #. @@ -27071,5 +26772,5 @@ #. 50000 #. -#. +#. #. #. @@ -27079,5 +26780,5 @@ #. 50000 #. -#. +#. #. #. @@ -27087,5 +26788,5 @@ #. 50000 #. -#. +#. #. #. @@ -27095,5 +26796,5 @@ #. 50000 #. -#. +#. #. #. @@ -27103,5 +26804,5 @@ #. 50000 #. -#. +#. #. #. @@ -27111,5 +26812,5 @@ #. 50000 #. -#. +#. #. #. @@ -27119,5 +26820,5 @@ #. 50000 #. -#. +#. #. #. @@ -27127,5 +26828,5 @@ #. 50000 #. -#. +#. #. #. @@ -27135,5 +26836,5 @@ #. 50000 #. -#. +#. #. #. @@ -27143,15 +26844,15 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:1467 build/trans_style.java:1481 -#: build/trans_style.java:1489 build/trans_style.java:1498 -#: build/trans_style.java:1506 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1530 -#: build/trans_style.java:1538 build/trans_style.java:1546 -#: build/trans_style.java:1554 build/trans_style.java:1562 -#: build/trans_style.java:1570 +#: build/trans_style.java:1490 build/trans_style.java:1504 +#: build/trans_style.java:1512 build/trans_style.java:1521 +#: build/trans_style.java:1529 build/trans_style.java:1537 +#: build/trans_style.java:1545 build/trans_style.java:1553 +#: build/trans_style.java:1561 build/trans_style.java:1569 +#: build/trans_style.java:1577 build/trans_style.java:1585 +#: build/trans_style.java:1593 msgid "power" msgstr "kraft" @@ -27161,9 +26862,9 @@ #. 50000 #. -#. +#. #. #. #. color pier -#: build/trans_style.java:1611 build/trans_style.java:1612 +#: build/trans_style.java:1634 build/trans_style.java:1635 msgid "pier" msgstr "brygge" @@ -27174,8 +26875,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:1620 +#: build/trans_style.java:1643 msgid "pipeline" msgstr "rørgate" @@ -27185,7 +26886,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27195,5 +26896,5 @@ #. 50000 #. -#. +#. #. #. @@ -27203,5 +26904,5 @@ #. 50000 #. -#. +#. #. #. @@ -27211,5 +26912,5 @@ #. 50000 #. -#. +#. #. #. @@ -27219,5 +26920,5 @@ #. 50000 #. -#. +#. #. #. @@ -27227,5 +26928,5 @@ #. 50000 #. -#. +#. #. #. @@ -27235,5 +26936,5 @@ #. 50000 #. -#. +#. #. #. @@ -27243,5 +26944,5 @@ #. 50000 #. -#. +#. #. #. @@ -27251,5 +26952,5 @@ #. 50000 #. -#. +#. #. #. @@ -27259,5 +26960,5 @@ #. 50000 #. -#. +#. #. #. @@ -27267,5 +26968,5 @@ #. 50000 #. -#. +#. #. #. @@ -27275,5 +26976,5 @@ #. 50000 #. -#. +#. #. #. @@ -27283,5 +26984,5 @@ #. 50000 #. -#. +#. #. #. @@ -27291,5 +26992,5 @@ #. 50000 #. -#. +#. #. #. @@ -27299,5 +27000,5 @@ #. 50000 #. -#. +#. #. #. @@ -27307,5 +27008,5 @@ #. 50000 #. -#. +#. #. #. @@ -27315,17 +27016,17 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:1710 build/trans_style.java:1718 -#: build/trans_style.java:1726 build/trans_style.java:1734 -#: build/trans_style.java:1742 build/trans_style.java:1750 -#: build/trans_style.java:1766 build/trans_style.java:1774 -#: build/trans_style.java:1782 build/trans_style.java:1790 -#: build/trans_style.java:1798 build/trans_style.java:1806 -#: build/trans_style.java:1814 build/trans_style.java:1822 -#: build/trans_style.java:1830 build/trans_style.java:1838 -#: build/trans_style.java:1846 +#: build/trans_style.java:1741 build/trans_style.java:1749 +#: build/trans_style.java:1757 build/trans_style.java:1765 +#: build/trans_style.java:1773 build/trans_style.java:1781 +#: build/trans_style.java:1797 build/trans_style.java:1805 +#: build/trans_style.java:1813 build/trans_style.java:1821 +#: build/trans_style.java:1829 build/trans_style.java:1837 +#: build/trans_style.java:1845 build/trans_style.java:1853 +#: build/trans_style.java:1861 build/trans_style.java:1869 +#: build/trans_style.java:1877 msgid "leisure" msgstr "fritid" @@ -27335,9 +27036,9 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:1758 +#: build/trans_style.java:1789 msgid "marina" msgstr "marina" @@ -27347,7 +27048,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27357,5 +27058,5 @@ #. 50000 #. -#. +#. #. #. @@ -27365,5 +27066,5 @@ #. 50000 #. -#. +#. #. #. @@ -27373,5 +27074,5 @@ #. 50000 #. -#. +#. #. #. @@ -27381,5 +27082,5 @@ #. 50000 #. -#. +#. #. #. @@ -27389,5 +27090,5 @@ #. 50000 #. -#. +#. #. #. @@ -27397,5 +27098,5 @@ #. 50000 #. -#. +#. #. #. @@ -27405,5 +27106,5 @@ #. 50000 #. -#. +#. #. #. @@ -27413,5 +27114,5 @@ #. 50000 #. -#. +#. #. #. @@ -27421,5 +27122,5 @@ #. 50000 #. -#. +#. #. #. @@ -27429,14 +27130,14 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:1856 build/trans_style.java:1864 -#: build/trans_style.java:1872 build/trans_style.java:1880 -#: build/trans_style.java:1888 build/trans_style.java:1896 -#: build/trans_style.java:1904 build/trans_style.java:1912 -#: build/trans_style.java:1920 build/trans_style.java:1928 -#: build/trans_style.java:1936 +#: build/trans_style.java:1887 build/trans_style.java:1895 +#: build/trans_style.java:1903 build/trans_style.java:1911 +#: build/trans_style.java:1919 build/trans_style.java:1927 +#: build/trans_style.java:1935 build/trans_style.java:1943 +#: build/trans_style.java:1951 build/trans_style.java:1959 +#: build/trans_style.java:1967 msgid "amenity" msgstr "fasilitet" @@ -27446,5 +27147,5 @@ #. 50000 #. -#. +#. #. #. @@ -27454,5 +27155,5 @@ #. 50000 #. -#. +#. #. #. @@ -27462,5 +27163,5 @@ #. 50000 #. -#. +#. #. #. @@ -27470,5 +27171,5 @@ #. 50000 #. -#. +#. #. #. @@ -27478,5 +27179,5 @@ #. 50000 #. -#. +#. #. #. @@ -27486,5 +27187,5 @@ #. 50000 #. -#. +#. #. #. @@ -27494,5 +27195,5 @@ #. 50000 #. -#. +#. #. #. @@ -27502,5 +27203,5 @@ #. 50000 #. -#. +#. #. #. @@ -27510,5 +27211,5 @@ #. 50000 #. -#. +#. #. #. @@ -27518,5 +27219,5 @@ #. 50000 #. -#. +#. #. #. @@ -27526,5 +27227,5 @@ #. 50000 #. -#. +#. #. #. @@ -27534,14 +27235,14 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:1944 build/trans_style.java:1952 -#: build/trans_style.java:1960 build/trans_style.java:1968 -#: build/trans_style.java:1976 build/trans_style.java:1984 -#: build/trans_style.java:1992 build/trans_style.java:2000 -#: build/trans_style.java:2008 build/trans_style.java:2015 -#: build/trans_style.java:2024 build/trans_style.java:2032 +#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1991 build/trans_style.java:1999 +#: build/trans_style.java:2007 build/trans_style.java:2015 +#: build/trans_style.java:2023 build/trans_style.java:2031 +#: build/trans_style.java:2039 build/trans_style.java:2046 +#: build/trans_style.java:2055 build/trans_style.java:2063 msgid "amenity_traffic" msgstr "fasilitet – trafikk" @@ -27551,5 +27252,5 @@ #. 50000 #. -#. +#. #. #. @@ -27558,5 +27259,5 @@ #. 50000 #. -#. +#. #. #. @@ -27566,5 +27267,5 @@ #. 50000 #. -#. +#. #. #. @@ -27573,5 +27274,5 @@ #. 50000 #. -#. +#. #. #. @@ -27581,5 +27282,5 @@ #. 50000 #. -#. +#. #. #. @@ -27589,5 +27290,5 @@ #. 50000 #. -#. +#. #. #. @@ -27597,5 +27298,5 @@ #. 50000 #. -#. +#. #. #. @@ -27604,5 +27305,5 @@ #. 50000 #. -#. +#. #. #. @@ -27612,5 +27313,5 @@ #. 50000 #. -#. +#. #. #. @@ -27620,5 +27321,5 @@ #. 50000 #. -#. +#. #. #. @@ -27628,5 +27329,5 @@ #. 50000 #. -#. +#. #. #. @@ -27636,5 +27337,5 @@ #. 50000 #. -#. +#. #. #. @@ -27643,5 +27344,5 @@ #. 50000 #. -#. +#. #. #. @@ -27650,5 +27351,5 @@ #. 50000 #. -#. +#. #. #. @@ -27657,5 +27358,5 @@ #. 50000 #. -#. +#. #. #. @@ -27664,5 +27365,5 @@ #. 50000 #. -#. +#. #. #. @@ -27671,5 +27372,5 @@ #. 50000 #. -#. +#. #. #. @@ -27678,5 +27379,5 @@ #. 50000 #. -#. +#. #. #. @@ -27685,5 +27386,5 @@ #. 50000 #. -#. +#. #. #. @@ -27692,5 +27393,5 @@ #. 50000 #. -#. +#. #. #. @@ -27699,5 +27400,5 @@ #. 50000 #. -#. +#. #. #. @@ -27706,5 +27407,5 @@ #. 50000 #. -#. +#. #. #. @@ -27713,5 +27414,5 @@ #. 50000 #. -#. +#. #. #. @@ -27720,5 +27421,5 @@ #. 50000 #. -#. +#. #. #. @@ -27727,5 +27428,5 @@ #. 50000 #. -#. +#. #. #. @@ -27735,5 +27436,5 @@ #. 50000 #. -#. +#. #. #. @@ -27743,5 +27444,5 @@ #. 50000 #. -#. +#. #. #. @@ -27751,5 +27452,5 @@ #. 50000 #. -#. +#. #. #. @@ -27759,5 +27460,5 @@ #. 50000 #. -#. +#. #. #. @@ -27767,5 +27468,5 @@ #. 50000 #. -#. +#. #. #. @@ -27775,5 +27476,5 @@ #. 50000 #. -#. +#. #. #. @@ -27783,5 +27484,5 @@ #. 50000 #. -#. +#. #. #. @@ -27791,5 +27492,5 @@ #. 50000 #. -#. +#. #. #. @@ -27799,5 +27500,5 @@ #. 50000 #. -#. +#. #. #. @@ -27808,5 +27509,5 @@ #. 50000 #. -#. +#. #. #. @@ -27816,5 +27517,5 @@ #. 50000 #. -#. +#. #. #. @@ -27824,5 +27525,5 @@ #. 50000 #. -#. +#. #. #. @@ -27832,5 +27533,5 @@ #. 50000 #. -#. +#. #. #. @@ -27840,5 +27541,5 @@ #. 50000 #. -#. +#. #. #. @@ -27848,5 +27549,5 @@ #. 50000 #. -#. +#. #. #. @@ -27856,5 +27557,5 @@ #. 50000 #. -#. +#. #. #. @@ -27864,5 +27565,5 @@ #. 50000 #. -#. +#. #. #. @@ -27872,5 +27573,5 @@ #. 50000 #. -#. +#. #. #. @@ -27880,5 +27581,5 @@ #. 50000 #. -#. +#. #. #. @@ -27888,5 +27589,5 @@ #. 50000 #. -#. +#. #. #. @@ -27896,5 +27597,5 @@ #. 50000 #. -#. +#. #. #. @@ -27904,5 +27605,5 @@ #. 50000 #. -#. +#. #. #. @@ -27912,5 +27613,5 @@ #. 50000 #. -#. +#. #. #. @@ -27920,5 +27621,5 @@ #. 50000 #. -#. +#. #. #. @@ -27928,5 +27629,5 @@ #. 50000 #. -#. +#. #. #. @@ -27936,5 +27637,5 @@ #. 50000 #. -#. +#. #. #. @@ -27944,5 +27645,5 @@ #. 50000 #. -#. +#. #. #. @@ -27952,5 +27653,5 @@ #. 50000 #. -#. +#. #. #. @@ -27960,5 +27661,5 @@ #. 50000 #. -#. +#. #. #. @@ -27967,27 +27668,27 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:2047 build/trans_style.java:2062 -#: build/trans_style.java:2070 build/trans_style.java:2078 -#: build/trans_style.java:2093 build/trans_style.java:2101 -#: build/trans_style.java:2109 build/trans_style.java:2117 -#: build/trans_style.java:2232 build/trans_style.java:2240 -#: build/trans_style.java:2247 build/trans_style.java:2256 -#: build/trans_style.java:2264 build/trans_style.java:2272 -#: build/trans_style.java:2280 build/trans_style.java:2288 -#: build/trans_style.java:2296 build/trans_style.java:2304 -#: build/trans_style.java:2367 build/trans_style.java:2375 -#: build/trans_style.java:2383 build/trans_style.java:2392 -#: build/trans_style.java:2400 build/trans_style.java:2407 -#: build/trans_style.java:2415 build/trans_style.java:2423 -#: build/trans_style.java:2431 build/trans_style.java:2439 -#: build/trans_style.java:2447 build/trans_style.java:2455 -#: build/trans_style.java:2463 build/trans_style.java:2471 -#: build/trans_style.java:2479 build/trans_style.java:2487 -#: build/trans_style.java:2495 build/trans_style.java:2503 -#: build/trans_style.java:2512 build/trans_style.java:2527 +#: build/trans_style.java:2078 build/trans_style.java:2093 +#: build/trans_style.java:2101 build/trans_style.java:2109 +#: build/trans_style.java:2124 build/trans_style.java:2132 +#: build/trans_style.java:2140 build/trans_style.java:2148 +#: build/trans_style.java:2263 build/trans_style.java:2271 +#: build/trans_style.java:2278 build/trans_style.java:2287 +#: build/trans_style.java:2295 build/trans_style.java:2303 +#: build/trans_style.java:2311 build/trans_style.java:2319 +#: build/trans_style.java:2327 build/trans_style.java:2335 +#: build/trans_style.java:2398 build/trans_style.java:2406 +#: build/trans_style.java:2414 build/trans_style.java:2423 +#: build/trans_style.java:2431 build/trans_style.java:2438 +#: build/trans_style.java:2446 build/trans_style.java:2454 +#: build/trans_style.java:2462 build/trans_style.java:2470 +#: build/trans_style.java:2478 build/trans_style.java:2486 +#: build/trans_style.java:2494 build/trans_style.java:2502 +#: build/trans_style.java:2510 build/trans_style.java:2518 +#: build/trans_style.java:2526 build/trans_style.java:2534 +#: build/trans_style.java:2543 build/trans_style.java:2558 msgid "amenity_light" msgstr "fasilitet – lys" @@ -27997,5 +27698,5 @@ #. 50000 #. -#. +#. #. #. @@ -28005,5 +27706,5 @@ #. 50000 #. -#. +#. #. #. @@ -28013,12 +27714,12 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. #. -#: build/trans_style.java:2125 build/trans_style.java:2133 -#: build/trans_style.java:3372 +#: build/trans_style.java:2156 build/trans_style.java:2164 +#: build/trans_style.java:3403 msgid "light_water" msgstr "light_vann" @@ -28028,5 +27729,5 @@ #. 50000 #. -#. +#. #. #. @@ -28036,5 +27737,5 @@ #. 50000 #. -#. +#. #. #. @@ -28044,5 +27745,5 @@ #. 50000 #. -#. +#. #. #. @@ -28052,5 +27753,5 @@ #. 50000 #. -#. +#. #. #. @@ -28060,5 +27761,5 @@ #. 50000 #. -#. +#. #. #. @@ -28068,5 +27769,5 @@ #. 50000 #. -#. +#. #. #. @@ -28076,11 +27777,11 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2343 build/trans_style.java:2351 -#: build/trans_style.java:2359 +#: build/trans_style.java:2342 build/trans_style.java:2350 +#: build/trans_style.java:2358 build/trans_style.java:2367 +#: build/trans_style.java:2374 build/trans_style.java:2382 +#: build/trans_style.java:2390 msgid "health" msgstr "helse" @@ -28090,7 +27791,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -28100,5 +27801,5 @@ #. 50000 #. -#. +#. #. #. @@ -28108,5 +27809,5 @@ #. 50000 #. -#. +#. #. #. @@ -28116,5 +27817,5 @@ #. 50000 #. -#. +#. #. #. @@ -28124,5 +27825,5 @@ #. 50000 #. -#. +#. #. #. @@ -28132,5 +27833,5 @@ #. 50000 #. -#. +#. #. #. @@ -28140,5 +27841,5 @@ #. 50000 #. -#. +#. #. #. @@ -28148,5 +27849,5 @@ #. 50000 #. -#. +#. #. #. @@ -28156,5 +27857,5 @@ #. 50000 #. -#. +#. #. #. @@ -28164,5 +27865,5 @@ #. 50000 #. -#. +#. #. #. @@ -28172,5 +27873,5 @@ #. 50000 #. -#. +#. #. #. @@ -28180,5 +27881,5 @@ #. 50000 #. -#. +#. #. #. @@ -28188,5 +27889,5 @@ #. 50000 #. -#. +#. #. #. @@ -28196,5 +27897,5 @@ #. 50000 #. -#. +#. #. #. @@ -28204,5 +27905,5 @@ #. 50000 #. -#. +#. #. #. @@ -28212,5 +27913,5 @@ #. 50000 #. -#. +#. #. #. @@ -28220,5 +27921,5 @@ #. 50000 #. -#. +#. #. #. @@ -28228,5 +27929,5 @@ #. 50000 #. -#. +#. #. #. @@ -28236,5 +27937,5 @@ #. 50000 #. -#. +#. #. #. @@ -28244,5 +27945,5 @@ #. 50000 #. -#. +#. #. #. @@ -28252,5 +27953,5 @@ #. 50000 #. -#. +#. #. #. @@ -28260,5 +27961,5 @@ #. 50000 #. -#. +#. #. #. @@ -28268,5 +27969,5 @@ #. 50000 #. -#. +#. #. #. @@ -28276,5 +27977,5 @@ #. 50000 #. -#. +#. #. #. @@ -28284,5 +27985,5 @@ #. 50000 #. -#. +#. #. #. @@ -28292,5 +27993,5 @@ #. 50000 #. -#. +#. #. #. @@ -28300,5 +28001,5 @@ #. 50000 #. -#. +#. #. #. @@ -28308,5 +28009,5 @@ #. 50000 #. -#. +#. #. #. @@ -28316,5 +28017,5 @@ #. 50000 #. -#. +#. #. #. @@ -28324,5 +28025,5 @@ #. 50000 #. -#. +#. #. #. @@ -28332,5 +28033,5 @@ #. 50000 #. -#. +#. #. #. @@ -28340,5 +28041,5 @@ #. 50000 #. -#. +#. #. #. @@ -28348,5 +28049,5 @@ #. 50000 #. -#. +#. #. #. @@ -28356,5 +28057,5 @@ #. 50000 #. -#. +#. #. #. @@ -28364,5 +28065,5 @@ #. 50000 #. -#. +#. #. #. @@ -28372,5 +28073,5 @@ #. 50000 #. -#. +#. #. #. @@ -28380,5 +28081,5 @@ #. 50000 #. -#. +#. #. #. @@ -28388,5 +28089,5 @@ #. 50000 #. -#. +#. #. #. @@ -28396,5 +28097,5 @@ #. 50000 #. -#. +#. #. #. @@ -28404,5 +28105,5 @@ #. 50000 #. -#. +#. #. #. @@ -28412,5 +28113,5 @@ #. 50000 #. -#. +#. #. #. @@ -28420,5 +28121,5 @@ #. 50000 #. -#. +#. #. #. @@ -28428,31 +28129,31 @@ #. 50000 #. -#. +#. #. #. #. #. -#: build/trans_style.java:2537 build/trans_style.java:2545 -#: build/trans_style.java:2553 build/trans_style.java:2561 -#: build/trans_style.java:2569 build/trans_style.java:2577 -#: build/trans_style.java:2585 build/trans_style.java:2593 -#: build/trans_style.java:2601 build/trans_style.java:2609 -#: build/trans_style.java:2617 build/trans_style.java:2625 -#: build/trans_style.java:2633 build/trans_style.java:2641 -#: build/trans_style.java:2649 build/trans_style.java:2657 -#: build/trans_style.java:2665 build/trans_style.java:2673 -#: build/trans_style.java:2681 build/trans_style.java:2689 -#: build/trans_style.java:2697 build/trans_style.java:2705 -#: build/trans_style.java:2713 build/trans_style.java:2721 -#: build/trans_style.java:2729 build/trans_style.java:2737 -#: build/trans_style.java:2745 build/trans_style.java:2753 -#: build/trans_style.java:2761 build/trans_style.java:2769 -#: build/trans_style.java:2777 build/trans_style.java:2785 -#: build/trans_style.java:2793 build/trans_style.java:2801 -#: build/trans_style.java:2809 build/trans_style.java:2817 -#: build/trans_style.java:2825 build/trans_style.java:2833 -#: build/trans_style.java:2841 build/trans_style.java:2849 -#: build/trans_style.java:2857 build/trans_style.java:2865 -#: build/trans_style.java:2874 +#: build/trans_style.java:2568 build/trans_style.java:2576 +#: build/trans_style.java:2584 build/trans_style.java:2592 +#: build/trans_style.java:2600 build/trans_style.java:2608 +#: build/trans_style.java:2616 build/trans_style.java:2624 +#: build/trans_style.java:2632 build/trans_style.java:2640 +#: build/trans_style.java:2648 build/trans_style.java:2656 +#: build/trans_style.java:2664 build/trans_style.java:2672 +#: build/trans_style.java:2680 build/trans_style.java:2688 +#: build/trans_style.java:2696 build/trans_style.java:2704 +#: build/trans_style.java:2712 build/trans_style.java:2720 +#: build/trans_style.java:2728 build/trans_style.java:2736 +#: build/trans_style.java:2744 build/trans_style.java:2752 +#: build/trans_style.java:2760 build/trans_style.java:2768 +#: build/trans_style.java:2776 build/trans_style.java:2784 +#: build/trans_style.java:2792 build/trans_style.java:2800 +#: build/trans_style.java:2808 build/trans_style.java:2816 +#: build/trans_style.java:2824 build/trans_style.java:2832 +#: build/trans_style.java:2840 build/trans_style.java:2848 +#: build/trans_style.java:2856 build/trans_style.java:2864 +#: build/trans_style.java:2872 build/trans_style.java:2880 +#: build/trans_style.java:2888 build/trans_style.java:2896 +#: build/trans_style.java:2905 msgid "shop" msgstr "butikk" @@ -28462,7 +28163,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -28472,5 +28173,5 @@ #. 50000 #. -#. +#. #. #. @@ -28480,5 +28181,5 @@ #. 50000 #. -#. +#. #. #. @@ -28488,5 +28189,5 @@ #. 50000 #. -#. +#. #. #. @@ -28496,5 +28197,5 @@ #. 50000 #. -#. +#. #. #. @@ -28504,5 +28205,5 @@ #. 50000 #. -#. +#. #. #. @@ -28512,5 +28213,5 @@ #. 50000 #. -#. +#. #. #. @@ -28520,12 +28221,12 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:2884 build/trans_style.java:2892 -#: build/trans_style.java:2900 build/trans_style.java:2908 -#: build/trans_style.java:2916 build/trans_style.java:2924 -#: build/trans_style.java:2932 build/trans_style.java:2940 +#: build/trans_style.java:2915 build/trans_style.java:2923 +#: build/trans_style.java:2931 build/trans_style.java:2939 +#: build/trans_style.java:2947 build/trans_style.java:2955 +#: build/trans_style.java:2963 build/trans_style.java:2971 msgid "hotel" msgstr "hotell" @@ -28535,5 +28236,5 @@ #. 50000 #. -#. +#. #. #. @@ -28543,5 +28244,5 @@ #. 50000 #. -#. +#. #. #. @@ -28551,5 +28252,5 @@ #. 50000 #. -#. +#. #. #. @@ -28559,5 +28260,5 @@ #. 50000 #. -#. +#. #. #. @@ -28567,5 +28268,5 @@ #. 50000 #. -#. +#. #. #. @@ -28575,5 +28276,5 @@ #. 50000 #. -#. +#. #. #. @@ -28584,5 +28285,5 @@ #. 50000 #. -#. +#. #. #. @@ -28592,5 +28293,5 @@ #. 50000 #. -#. +#. #. #. @@ -28600,5 +28301,5 @@ #. 40000 #. -#. +#. #. #. @@ -28608,5 +28309,5 @@ #. 50000 #. -#. +#. #. #. @@ -28615,5 +28316,5 @@ #. 40000 #. -#. +#. #. #. @@ -28622,13 +28323,13 @@ #. 40000 #. -#. +#. #. #. #. -#: build/trans_style.java:2948 build/trans_style.java:2956 -#: build/trans_style.java:2964 build/trans_style.java:2972 -#: build/trans_style.java:2980 build/trans_style.java:2988 -#: build/trans_style.java:2989 build/trans_style.java:2997 -#: build/trans_style.java:3013 build/trans_style.java:3035 +#: build/trans_style.java:2979 build/trans_style.java:2987 +#: build/trans_style.java:2995 build/trans_style.java:3003 +#: build/trans_style.java:3011 build/trans_style.java:3019 +#: build/trans_style.java:3020 build/trans_style.java:3028 +#: build/trans_style.java:3044 build/trans_style.java:3066 msgid "tourism" msgstr "turisme" @@ -28638,7 +28339,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -28648,5 +28349,5 @@ #. 50000 #. -#. +#. #. #. @@ -28656,5 +28357,5 @@ #. 50000 #. -#. +#. #. #. @@ -28664,5 +28365,5 @@ #. 50000 #. -#. +#. #. #. @@ -28672,5 +28373,5 @@ #. 50000 #. -#. +#. #. #. @@ -28680,5 +28381,5 @@ #. 50000 #. -#. +#. #. #. @@ -28688,5 +28389,5 @@ #. 50000 #. -#. +#. #. #. @@ -28696,5 +28397,5 @@ #. 50000 #. -#. +#. #. #. @@ -28704,5 +28405,5 @@ #. 50000 #. -#. +#. #. #. @@ -28712,13 +28413,13 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:3045 build/trans_style.java:3053 -#: build/trans_style.java:3061 build/trans_style.java:3069 -#: build/trans_style.java:3077 build/trans_style.java:3085 -#: build/trans_style.java:3093 build/trans_style.java:3101 -#: build/trans_style.java:3109 build/trans_style.java:3117 +#: build/trans_style.java:3076 build/trans_style.java:3084 +#: build/trans_style.java:3092 build/trans_style.java:3100 +#: build/trans_style.java:3108 build/trans_style.java:3116 +#: build/trans_style.java:3124 build/trans_style.java:3132 +#: build/trans_style.java:3140 build/trans_style.java:3148 msgid "historic" msgstr "historisk" @@ -28728,8 +28429,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:3165 +#: build/trans_style.java:3196 msgid "quarry" msgstr "steinbrudd" @@ -28740,8 +28441,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:3173 +#: build/trans_style.java:3204 msgid "landfill" msgstr "avfallsdeponi" @@ -28752,5 +28453,5 @@ #. 50000 #. -#. +#. #. #. @@ -28760,8 +28461,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:3181 build/trans_style.java:3189 +#: build/trans_style.java:3212 build/trans_style.java:3220 msgid "basin" msgstr "vannmagasin" @@ -28772,8 +28473,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:3197 +#: build/trans_style.java:3228 msgid "forest" msgstr "skog" @@ -28784,8 +28485,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:3229 +#: build/trans_style.java:3260 msgid "farmyard" msgstr "gårdstun" @@ -28796,6 +28497,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -28805,8 +28506,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:3238 build/trans_style.java:3246 +#: build/trans_style.java:3269 build/trans_style.java:3277 msgid "retail" msgstr "butikker" @@ -28817,8 +28518,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:3254 +#: build/trans_style.java:3285 msgid "industrial" msgstr "industri" @@ -28829,8 +28530,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:3262 +#: build/trans_style.java:3293 msgid "brownfield" msgstr "rivningsområde" @@ -28841,8 +28542,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:3270 +#: build/trans_style.java:3301 msgid "greenfield" msgstr "byggeområde" @@ -28853,8 +28554,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:3278 +#: build/trans_style.java:3309 msgid "railland" msgstr "jernbanegrunn" @@ -28865,5 +28566,5 @@ #. 50000 #. -#. +#. #. #. @@ -28873,7 +28574,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -28883,5 +28584,5 @@ #. 50000 #. -#. +#. #. #. @@ -28891,5 +28592,5 @@ #. 50000 #. -#. +#. #. #. @@ -28899,5 +28600,5 @@ #. 50000 #. -#. +#. #. #. @@ -28907,11 +28608,11 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:3295 build/trans_style.java:3330 -#: build/trans_style.java:3338 build/trans_style.java:3346 -#: build/trans_style.java:3354 build/trans_style.java:3362 +#: build/trans_style.java:3326 build/trans_style.java:3361 +#: build/trans_style.java:3369 build/trans_style.java:3377 +#: build/trans_style.java:3385 build/trans_style.java:3393 msgid "military" msgstr "millitært" @@ -28922,8 +28623,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:3303 +#: build/trans_style.java:3334 msgid "cemetery" msgstr "gravlund" @@ -28933,8 +28634,8 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3410 msgid "peak" msgstr "fjelltopp" @@ -28945,9 +28646,9 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:3388 +#: build/trans_style.java:3419 msgid "glacier" msgstr "isbre" @@ -28957,9 +28658,9 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:3396 +#: build/trans_style.java:3427 msgid "volcano" msgstr "vulkan" @@ -28969,5 +28670,5 @@ #. 50000 #. -#. +#. #. #. @@ -28978,5 +28679,5 @@ #. 50000 #. -#. +#. #. #. @@ -28986,5 +28687,5 @@ #. 50000 #. -#. +#. #. #. @@ -28994,5 +28695,5 @@ #. 50000 #. -#. +#. #. #. @@ -29002,5 +28703,5 @@ #. 50000 #. -#. +#. #. #. @@ -29010,12 +28711,12 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:3404 build/trans_style.java:3405 -#: build/trans_style.java:3413 build/trans_style.java:3429 -#: build/trans_style.java:3493 build/trans_style.java:3501 -#: build/trans_style.java:3509 +#: build/trans_style.java:3435 build/trans_style.java:3436 +#: build/trans_style.java:3444 build/trans_style.java:3460 +#: build/trans_style.java:3524 build/trans_style.java:3532 +#: build/trans_style.java:3540 msgid "natural" msgstr "natur" @@ -29025,9 +28726,9 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:3421 +#: build/trans_style.java:3452 msgid "scrub" msgstr "krattskog" @@ -29037,9 +28738,9 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:3437 +#: build/trans_style.java:3468 msgid "heath" msgstr "beiteområde" @@ -29049,9 +28750,9 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:3445 +#: build/trans_style.java:3476 msgid "woodarea" msgstr "" @@ -29061,9 +28762,9 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:3477 +#: build/trans_style.java:3508 msgid "mud" msgstr "søle" @@ -29073,9 +28774,9 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:3485 +#: build/trans_style.java:3516 msgid "beach" msgstr "strand" @@ -29085,5 +28786,5 @@ #. 50000 #. -#. +#. #. #. @@ -29092,7 +28793,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -29102,5 +28803,5 @@ #. 50000 #. -#. +#. #. #. @@ -29110,5 +28811,5 @@ #. 50000 #. -#. +#. #. #. @@ -29118,5 +28819,5 @@ #. 50000 #. -#. +#. #. #. @@ -29126,5 +28827,5 @@ #. 50000 #. -#. +#. #. #. @@ -29134,5 +28835,5 @@ #. 50000 #. -#. +#. #. #. @@ -29142,5 +28843,5 @@ #. 50000 #. -#. +#. #. #. @@ -29150,11 +28851,11 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:3525 build/trans_style.java:3533 -#: build/trans_style.java:3541 build/trans_style.java:3549 -#: build/trans_style.java:3557 build/trans_style.java:3565 -#: build/trans_style.java:3573 build/trans_style.java:3581 +#: build/trans_style.java:3556 build/trans_style.java:3564 +#: build/trans_style.java:3572 build/trans_style.java:3580 +#: build/trans_style.java:3588 build/trans_style.java:3596 +#: build/trans_style.java:3604 build/trans_style.java:3612 msgid "route" msgstr "rute" @@ -29165,7 +28866,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -29175,5 +28876,5 @@ #. 50000 #. -#. +#. #. #. @@ -29216,5 +28917,5 @@ #. color boundary #. -#. +#. #. #. @@ -29224,5 +28925,5 @@ #. 50000 #. -#. +#. #. #. @@ -29232,5 +28933,5 @@ #. 50000 #. -#. +#. #. #. @@ -29240,15 +28941,15 @@ #. 50000 #. -#. +#. #. #. -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3603 build/trans_style.java:3607 -#: build/trans_style.java:3611 build/trans_style.java:3615 -#: build/trans_style.java:3619 build/trans_style.java:3623 -#: build/trans_style.java:3627 build/trans_style.java:3631 -#: build/trans_style.java:3635 build/trans_style.java:3640 -#: build/trans_style.java:3648 build/trans_style.java:3656 -#: build/trans_style.java:3664 +#: build/trans_style.java:3622 build/trans_style.java:3630 +#: build/trans_style.java:3634 build/trans_style.java:3638 +#: build/trans_style.java:3642 build/trans_style.java:3646 +#: build/trans_style.java:3650 build/trans_style.java:3654 +#: build/trans_style.java:3658 build/trans_style.java:3662 +#: build/trans_style.java:3666 build/trans_style.java:3671 +#: build/trans_style.java:3679 build/trans_style.java:3687 +#: build/trans_style.java:3695 msgid "boundary" msgstr "grense" @@ -29259,5 +28960,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -29306,5 +29007,5 @@ #. 200000000 #. -#. +#. #. #. @@ -29314,5 +29015,5 @@ #. 200000000 #. -#. +#. #. #. @@ -29322,5 +29023,5 @@ #. 200000000 #. -#. +#. #. #. @@ -29330,5 +29031,5 @@ #. 200000000 #. -#. +#. #. #. @@ -29338,5 +29039,5 @@ #. 200000000 #. -#. +#. #. #. @@ -29346,5 +29047,5 @@ #. 200000000 #. -#. +#. #. #. @@ -29354,5 +29055,5 @@ #. 50000 #. -#. +#. #. #. @@ -29362,5 +29063,5 @@ #. 50000 #. -#. +#. #. #. @@ -29370,5 +29071,5 @@ #. 50000 #. -#. +#. #. #. @@ -29378,5 +29079,5 @@ #. 50000 #. -#. +#. #. #. @@ -29386,5 +29087,5 @@ #. 50000 #. -#. +#. #. #. @@ -29394,15 +29095,15 @@ #. 50000 #. -#. +#. #. #. #. -#: build/trans_style.java:4104 build/trans_style.java:4112 -#: build/trans_style.java:4120 build/trans_style.java:4128 -#: build/trans_style.java:4136 build/trans_style.java:4144 -#: build/trans_style.java:4152 build/trans_style.java:4160 -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 +#: build/trans_style.java:4135 build/trans_style.java:4143 +#: build/trans_style.java:4151 build/trans_style.java:4159 +#: build/trans_style.java:4167 build/trans_style.java:4175 +#: build/trans_style.java:4183 build/trans_style.java:4191 +#: build/trans_style.java:4199 build/trans_style.java:4207 +#: build/trans_style.java:4215 build/trans_style.java:4223 +#: build/trans_style.java:4231 msgid "place" msgstr "sted" @@ -29412,5 +29113,5 @@ #. 50000 #. -#. +#. #. #. @@ -29419,5 +29120,5 @@ #. 50000 #. -#. +#. #. #. @@ -29426,5 +29127,5 @@ #. 50000 #. -#. +#. #. #. @@ -29433,5 +29134,5 @@ #. 40000 #. -#. +#. #. #. @@ -29440,5 +29141,5 @@ #. 40000 #. -#. +#. #. #. @@ -29447,9 +29148,9 @@ #. 40000 #. -#. +#. #. #. -#: build/trans_style.java:4289 build/trans_style.java:4296 -#: build/trans_style.java:4303 build/trans_style.java:4310 +#: build/trans_style.java:4320 build/trans_style.java:4327 +#: build/trans_style.java:4334 build/trans_style.java:4341 msgid "address" msgstr "adresse" @@ -29540,5 +29241,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -29546,28 +29247,28 @@ #. relation - a relation #. * - all data types -#. +#. #. Message type can be: #. E - an error #. W - a warning #. I - an low priority informational warning -#. +#. #. Key and value are expressions describing certain keys and values of these keys. #. Regulator expressions are supported. In this case the expressions starts and #. ends with // signs. If an 'i' is appended, the regular expression is #. case insensitive. -#. +#. #. The * sign indicates any string. #. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special #. handling for boolean values (yes, true, 0, false, no, ...). -#. +#. #. Expression can be: #. != - the key/value combination does not match #. == - the key/value combination does match -#. +#. #. To have more complicated expressions, multiple elements can be grouped together #. with an logical and (&&). -#. +#. #. The comment at the end of a rule is displayed in validator description -#. +#. #. Empty lines and space signs are ignored #: build/trans_validator.java:38 @@ -29682,5 +29383,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -29693,5 +29394,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -29716,6 +29417,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -29724,6 +29425,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -29738,6 +29439,6 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& -#. -#. +#. +#. #. only for Czech Republic #: build/trans_wms.java:27 @@ -29751,6 +29452,6 @@ #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& -#. -#. +#. +#. #. only for GB #. fails with division by zero error @@ -29770,6 +29471,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -29793,6 +29494,6 @@ #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF -#. -#. +#. +#. #. only for Italy #: build/trans_wms.java:46 @@ -29805,4 +29506,111 @@ msgstr "" +#~ msgid "Bridleway" +#~ msgstr "Ridevei" + +#~ msgid "Cycleway" +#~ msgstr "Sykkelvei" + +#~ msgid "Footway" +#~ msgstr "Gangvei" + +#~ msgid "Track Grade 1" +#~ msgstr "Traktorvei klasse 1" + +#~ msgid "Edit Track of grade 1" +#~ msgstr "Rediger traktorvei klasse 1" + +#~ msgid "Track Grade 2" +#~ msgstr "Traktorvei klasse 2" + +#~ msgid "Edit Track of grade 2" +#~ msgstr "Rediger traktorvei klasse 2" + +#~ msgid "Track Grade 3" +#~ msgstr "Traktorvei klasse 3" + +#~ msgid "Edit Track of grade 3" +#~ msgstr "Rediger traktorvei klasse 3" + +#~ msgid "Track Grade 4" +#~ msgstr "Traktorvei klasse 4" + +#~ msgid "Edit Track of grade 4" +#~ msgstr "Rediger traktorvei klasse 4" + +#~ msgid "Track Grade 5" +#~ msgstr "Traktorvei klasse 5" + +#~ msgid "Edit Track of grade 5" +#~ msgstr "Rediger traktorvei klasse 5" + +#~ msgid "Edit Hiking" +#~ msgstr "Rediger tursti" + +#~ msgid "Edit Mountain Hiking" +#~ msgstr "Rediger fjellsti" + +#~ msgid "Edit Demanding Mountain Hiking" +#~ msgstr "Rediger krevende fjellsti" + +#~ msgid "Edit Alpine Hiking" +#~ msgstr "Rediger alpin fjellsti" + +#~ msgid "Edit Demanding Alpine Hiking" +#~ msgstr "Rediger krevende alpin fjellsti" + +#~ msgid "Edit Difficult Alpine Hiking" +#~ msgstr "Rediger vanskelig alpin fjellsti" + +#~ msgid "Parameter ''{0}'' must not be null" +#~ msgstr "Parameter ''{0}'' kan ikke vœre null" + +#~ msgid "Parameter ''{0}'' must not be null." +#~ msgstr "parameter «{0}» må ha en verdi" + +#~ msgid "" +#~ "The selected way(s) have nodes outside of the downloaded data region.\n" +#~ "This can lead to nodes being deleted accidentally.\n" +#~ "Are you really sure to continue?" +#~ msgstr "" +#~ "De valgte linjene har noder utenfor nedlastet dataområde.\n" +#~ "Dette kan medføre at noder blir slettet ved uhell.\n" +#~ "Er du sikker på at du vil fortsette?" + +#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''." +#~ msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{1}»" + +#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''." +#~ msgstr "parameter «{0}» i intervall 0–{1} forventet – leste {2}" + +#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." +#~ msgstr "Parameter «{0}» > 0 forventet – leste «{1}»." + +#~ msgid "Parameter current out of range. Got {0}." +#~ msgstr "parameter «current» utenfor rekkevidde: leste {0}" + +#~ msgid "Unexpected column index. Got {0}." +#~ msgstr "Uventet kolonneindeks: {0}" + +#~ msgid "Parameter 'col' must be 0 or 1. Got {0}." +#~ msgstr "Parameter «col» må være 0 eller 1. Leste {0}." + +#~ msgid ">" +#~ msgstr ">" + +#~ msgid "Conflicts in data" +#~ msgstr "Konflikter i data" + +#~ msgid "image" +#~ msgid_plural "images" +#~ msgstr[0] "bilde" +#~ msgstr[1] "bilder" + +#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''." +#~ msgstr "parameter «{0}» >= 0 forventet – leste «{1}»" + +#~ msgid "Plugin {0} requires JOSM update to version {1}." +#~ msgstr "Programtillegg {0} krever JOSM-oppdatering til versjon {1}." + #~ msgid "Move" #~ msgstr "Flytt" @@ -29814,7 +29622,4 @@ #~ msgstr "Noen av nodene er (nesten) på linje" -#~ msgid "Combine Anyway" -#~ msgstr "Sammenføy uansett" - #~ msgid "Email" #~ msgstr "E-post" @@ -29826,11 +29631,10 @@ #~ msgstr "JOSM hjelpesider" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Feil ved nedlasting av {0}" #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" #~ "De valgte nodene er medlemmer i forskjellige relasjoner. Vil du fremdeles " @@ -29850,8 +29654,9 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" -#~ "Feilmelding: cannot check conditions for no layer. Send inn en feilmelding." +#~ "Feilmelding: cannot check conditions for no layer. Send inn en " +#~ "feilmelding." #~ msgid "No document open so nothing to save." @@ -29868,9 +29673,9 @@ #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" #~ "Ingen data å oppdatere. Har du allerede åpnet eller lastet dette ned?" -#, java-format #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -29887,5 +29692,4 @@ #~ msgstr "Forventer parentes slutt." -#, java-format #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "{0} konflikter må løses i {1} objecter" @@ -29918,5 +29722,4 @@ #~ msgstr "rett versjon" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -29952,10 +29755,10 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" -#~ "Tilbakestill status på alle valgte objekt til versjon som valgt i historikk." - -#, java-format +#~ "Tilbakestill status på alle valgte objekt til versjon som valgt i " +#~ "historikk." + #~ msgid "Conflicts: {0}" #~ msgstr "Konflikter: {0}" @@ -29964,5 +29767,4 @@ #~ msgstr "Slett valgt Lag." -#, java-format #~ msgid "Layers: {0}" #~ msgstr "Lag: {0}" @@ -29992,9 +29794,7 @@ #~ msgstr "Flytt ned" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "Relasjons-editor: {0}" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Opphavsmenn: {0}" @@ -30021,21 +29821,16 @@ #~ msgstr "Ingen bilder med lesbare tidsstempler funnet" -#, java-format #~ msgid "No time for point {0} x {1}" #~ msgstr "Ingen tid gitt for punkt {0} x {1}" -#, java-format #~ msgid "Images for {0}" #~ msgstr "Bilder for {0}" -#, java-format #~ msgid "GPS start: {0}" #~ msgstr "GPS start: {0}" -#, java-format #~ msgid "current delta: {0}s" #~ msgstr "nåværende forskjell: {0}s" -#, java-format #~ msgid "GPS end: {0}" #~ msgstr "GPS-slutt: {0}" @@ -30044,5 +29839,4 @@ #~ msgstr "tidssone-forskjell: " -#, java-format #~ msgid "{0} within the track." #~ msgstr "{0} innenfor sporet." @@ -30086,11 +29880,11 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" #~ "ADVARSEL: Passordet er lagret i vanlig tekst (IKKE KRYPTERT) i " -#~ "konfigurasjons filen.
Passordet er overført i vanlig tekst til serveren, " -#~ "satt inn i web adressen.
Ikke bruk et viktig passord da andre kan lese " -#~ "det." +#~ "konfigurasjons filen.
Passordet er overført i vanlig tekst til " +#~ "serveren, satt inn i web adressen.
Ikke bruk et viktig passord da " +#~ "andre kan lese det." #~ msgid "Incorrect password or username." @@ -30152,5 +29946,4 @@ #~ msgstr "Fandt -element i en ikke-relation." -#, java-format #~ msgid "" #~ "There were problems with the following plugins:\n" @@ -30162,5 +29955,4 @@ #~ " {0}" -#, java-format #~ msgid "{0} Plugin successfully updated. Please restart JOSM." #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." @@ -30168,33 +29960,26 @@ #~ msgstr[1] "{0} Programtillegg oppdatert. Restart JOSM." -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "" -#~ "Programtillegget {0} kan være ødelagt eller kunne ikke lastes ned automatisk." - -#, java-format +#~ "Programtillegget {0} kan være ødelagt eller kunne ikke lastes ned " +#~ "automatisk." + #~ msgid "Plugin not found: {0}." #~ msgstr "Fant ikke programtillegget: {0}." -#, java-format -#~ msgid "Plugin {0} is required by plugin {1} but was not found." -#~ msgstr "" -#~ "Programtillegget {1} er avhengig av programtillegg {0} men ble ikke funnet." - -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Programtillegget krever oppdatering {0} av JOSM." -#, java-format #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Kunne ikke laste programtillegg: {0} fra {1}" #~ msgid "" -#~ "Activating the updated plugins failed. Check if JOSM has the permission to " -#~ "overwrite the existing ones." +#~ "Activating the updated plugins failed. Check if JOSM has the permission " +#~ "to overwrite the existing ones." #~ msgstr "" -#~ "Kunne ikke bruke oppdaterte programtillegg. Kontroller om JOSM tilgang til å " -#~ "skrive over eksisterende." +#~ "Kunne ikke bruke oppdaterte programtillegg. Kontroller om JOSM tilgang " +#~ "til å skrive over eksisterende." #~ msgid "" @@ -30202,6 +29987,6 @@ #~ "setting the config option 'pluginmanager.warntime'.)" #~ msgstr "" -#~ "(Du kan endre antall dager mellom advarslene
ved å endre denne verdien i " -#~ "oppstettet 'pluginmanager.warntime'.)" +#~ "(Du kan endre antall dager mellom advarslene
ved å endre denne verdien " +#~ "i oppstettet 'pluginmanager.warntime'.)" #~ msgid "" @@ -30209,5 +29994,6 @@ #~ "about the problem." #~ msgstr "" -#~ "Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM utviklerne." +#~ "Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM " +#~ "utviklerne." #~ msgid "Download missing plugins" @@ -30220,5 +30006,4 @@ #~ msgstr "Alle installerte programtillegg er siste versjon." -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Venligst send en feilrapport på {0}" @@ -30233,5 +30018,4 @@ #~ msgstr "Husk å inkludere følgende informasjon:" -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -30240,12 +30024,12 @@ #~ "{0}" #~ msgstr "" -#~ "Programtillegg lista er allerede tilgengelig. Vil du laste ned ny versjon " -#~ "over den eksisterende?\n" +#~ "Programtillegg lista er allerede tilgengelig. Vil du laste ned ny " +#~ "versjon over den eksisterende?\n" #~ "\n" #~ "{0}" #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" #~ "Prøv å oppdatere til siste versjon av JOSM og alle programtillegg før du " @@ -30269,21 +30053,20 @@ #~ "I can take a picture of my GPS receiver.
Can this help?" #~ msgstr "" -#~ "Jeg kan fotogragere min GPS mottaker.
Kan det være til hjelp?" +#~ "Jeg kan fotogragere min GPS mottaker.
Kan det være til hjelp?" #~ msgid "GPX Track loaded" #~ msgstr "GPX-spor er lagt inn" -#, java-format #~ msgid "Found {0} matches of {1} in GPX track {2}" #~ msgstr "Fant {0} treff av {1} i GPX spor {2}" #~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You can " -#~ "adjust the sliders to manually match the photos." +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." #~ msgstr "" #~ "Feil ved kobling av foto til GPX spor. Still inn rullefeltet for manuell " #~ "kobling." -#, java-format #~ msgid "Offset between track and photos: {0}m {1}s" #~ msgstr "Forskyvning mellom spor og foto: {0}m {1}s" @@ -30301,5 +30084,4 @@ #~ msgstr "Lambert Zone 4 cache file (.4)" -#, java-format #~ msgid "Change the projection to {0} first." #~ msgstr "Bytt til kartprojeksjonen {0}." @@ -30326,6 +30108,6 @@ #~ msgstr "Åpne vindu med OpenStreetBugs og aktiviser automatisk nedlasting" -#, java-format -#~ msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" #~ msgstr "" #~ "Lambert sone {0} i mellomlager stemmer ikke med aktiv Lambert sone {1}" @@ -30334,5 +30116,4 @@ #~ msgstr "osmarender-indstillinger" -#, java-format #~ msgid "requested: {0}" #~ msgstr "bestilt: {0}" @@ -30398,11 +30179,10 @@ #~ msgstr "Hjelp / Om" -#, java-format #~ msgid "rectifier id={0}" #~ msgstr "rectifier id={0}" #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -30419,6 +30199,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example,replacing 73 with your image id: \n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example,replacing 73 with your image id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -30427,6 +30207,6 @@ #~ "use." #~ msgstr "" -#~ "Du kan legge til, endre eller slette WMS kilder i WMSplugin Innstillinger - " -#~ "disse vil vises i WMS menyen.\n" +#~ "Du kan legge til, endre eller slette WMS kilder i WMSplugin Innstillinger " +#~ "- disse vil vises i WMS menyen.\n" #~ "Kan også settes manuelt i Avanserte innstillinger, etter følgende mal:\n" #~ "wmsplugin.url.1.name=Landsat\n" @@ -30439,16 +30219,17 @@ #~ "format=image/jpeg \n" #~ "\n" -#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , må du " -#~ "bare oppgi gyldig 'id'.\n" -#~ "Å legge inn Metacarta Map Rectifier menyer, lag en URL manuelt som i dette " -#~ "eksempelet. Bytt ut 73 med din bilde id: \n" +#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , må " +#~ "du bare oppgi gyldig 'id'.\n" +#~ "Å legge inn Metacarta Map Rectifier menyer, lag en URL manuelt som i " +#~ "dette eksempelet. Bytt ut 73 med din bilde id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" #~ " \n" -#~ "OBS: Sjekk at bildet er egnet med hensyn til kopibeskyttelse. Er du i tvil: " -#~ "la være å bruke bildet." +#~ "OBS: Sjekk at bildet er egnet med hensyn til kopibeskyttelse. Er du i " +#~ "tvil: la være å bruke bildet." #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -#~ msgstr "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS" +#~ msgstr "" +#~ "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS" #~ msgid "Please select the row to copy." @@ -30464,6 +30245,6 @@ #~ msgid "" #~ "The main feature of the plugin is the possibility to delete points of the " -#~ "GPX track. This plugin can be used to prepare tracks for uploading to OSM " -#~ "eg. deleting uninteresting parts of track." +#~ "GPX track. This plugin can be used to prepare tracks for uploading to " +#~ "OSM eg. deleting uninteresting parts of track." #~ msgstr "" #~ "Programtilleggets hovedfunksjon er sletting av punkt i GPX sporfil. " @@ -30481,6 +30262,6 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?" @@ -30504,5 +30285,4 @@ #~ msgstr "Splitt linje i segment" -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "Ignorerer en linje fordi den har en node som ikke eksisterer: {0}\n" @@ -30512,6 +30292,6 @@ #~ msgid "" -#~ "Several utilities that make your life easier: e.g. simplify way, join areas, " -#~ "jump to position." +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." #~ msgstr "" #~ "Flere verktøy som kan gjøre livet enklere. Eksempel: forenkle linje, Slå " @@ -30539,5 +30319,4 @@ #~ msgstr "infotavle" -#, java-format #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart." @@ -30573,5 +30352,4 @@ #~ msgstr "Datalag" -#, java-format #~ msgid "Contact {0}..." #~ msgstr "Koble til {0} …" @@ -30583,5 +30361,4 @@ #~ msgstr "Laster ned …" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Kan ikke åpne innstillingsmappe: {0}" @@ -30613,5 +30390,6 @@ #~ msgid "" -#~ "Parameters are read in the order they are specified, so make sure you load\n" +#~ "Parameters are read in the order they are specified, so make sure you " +#~ "load\n" #~ "some data before --selection" #~ msgstr "" @@ -30628,5 +30406,4 @@ #~ msgstr "Fant ikke fila" -#, java-format #~ msgid "" #~ "WARNING: launching browser windows for the first {0} of {1} selected " @@ -30635,40 +30412,32 @@ #~ "ADVARSEL: Starter leservindu kun for de første {0} av {1} valgte objektene" -#, java-format #~ msgid "" #~ "Current number of changes exceeds the max. number of changes, current is " #~ "{0}, max is {1}" #~ msgstr "" -#~ "Gjeldende antall endringer overstiger maksimalt antall endringer: gjeldende " -#~ "er {0}, maksimalt er {1}" +#~ "Gjeldende antall endringer overstiger maksimalt antall endringer: " +#~ "gjeldende er {0}, maksimalt er {1}" #~ msgid "Failed to initialize API. Please try again later." #~ msgstr "Klarte ikke starte API. Prøv igjen senere." -#, java-format #~ msgid "multipolygon way ''{0}'' is not closed." #~ msgstr "multipolygon-linje «{0}» er ikke lukket." -#, java-format #~ msgid "Way ''{0}'' with less than two points." #~ msgstr "Linje «{0}» med færre enn to punkter." -#, java-format #~ msgid "No useful role ''{0}'' for Way ''{1}''." #~ msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»." -#, java-format #~ msgid "Non-Way ''{0}'' in multipolygon." #~ msgstr "Multipolygon-medlem «{0}» er ikke en linje." -#, java-format #~ msgid "No outer way for multipolygon ''{0}''." #~ msgstr "Ingen ytre linje for multipolygon «{0}»." -#, java-format #~ msgid "Intersection between ways ''{0}'' and ''{1}''." #~ msgstr "Skjæring mellom linjene «{0}» og «{1}»." -#, java-format #~ msgid "Inner way ''{0}'' is outside." #~ msgstr "Indre linje «{0}» er utenfor." @@ -30695,5 +30464,4 @@ #~ msgstr "Rydder ut 1 objekt" -#, java-format #~ msgid "removing reference from way {0}" #~ msgstr "fjerner henvisning fra vei {0}" @@ -30759,5 +30527,4 @@ #~ msgstr "URL-adressen for OSM-tjeneren (REST API)" -#, java-format #~ msgid "Downloaded plugin information from {0} site" #~ msgid_plural "Downloaded plugin information from {0} sites" @@ -30772,10 +30539,10 @@ #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." #~ msgstr "" -#~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for hjelp." +#~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se http://" +#~ "josm.openstreetmap.de/wiki/TaggingPresets for hjelp." #~ msgid "" -#~ "Tools to work with authors/users. Selects map data that belongs to selected " -#~ "user, opens browser showing selected author profile page." +#~ "Tools to work with authors/users. Selects map data that belongs to " +#~ "selected user, opens browser showing selected author profile page." #~ msgstr "" #~ "Verktøy for å redigere opphavspersoner/brukere. Velger kartdata fra valgt " @@ -30797,9 +30564,7 @@ #~ msgstr "Yahoo (WebKit GTK)" -#, java-format #~ msgid "Could not read from URL: \"{0}\"" #~ msgstr "Klarte ikke lese fra URL: «{0}»" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -30815,9 +30580,7 @@ #~ "Ikke last opp data etter denne beskjeden." -#, java-format #~ msgid "Cannot read time \"{0}\" from point {1} x {2}" #~ msgstr "Klarte ikke lese tid «{0}» for punkt {1} x {2}" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -30835,25 +30598,19 @@ #~ "Ikke last opp data etter denne meldingen." -#, java-format #~ msgid "The date in file \"{0}\" could not be parsed." #~ msgstr "Klarte ikke tolke datoen i fila «{0}»." -#, java-format #~ msgid "There is no EXIF time within the file \"{0}\"." #~ msgstr "Det er ikke noe EXIF-tidspunkt i fila «{0}»." -#, java-format #~ msgid "Parsing error in URL: \"{0}\"" #~ msgstr "Feil i URL: «{0}»" -#, java-format #~ msgid "Deleted member ''{0}'' in relation." #~ msgstr "Slettet medlem «{0}» i relasjon." -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Bruk objektmal «{0}» i gruppe «{1}»" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Bruk objektmal «{0}»" @@ -30862,9 +30619,7 @@ #~ msgstr "AgPifoJ – Geotaggede bilder" -#, java-format #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" #~ msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»" -#, java-format #~ msgid "" #~ "Uploading failed because a primitive you tried " @@ -30873,6 +30628,6 @@ #~ msgstr "" #~ "Opplasting feilet fordi et element du prøvde " -#~ "å
slette allerede er slettet på " -#~ "tjeneren.

Feilmelding:
{0}" +#~ "å
slette allerede er slettet på tjeneren.

Feilmelding:
{0}" #~ msgid "parameter '{0}' must not be null" @@ -30882,5 +30637,4 @@ #~ msgstr "Bruk ufullstendige løsninger" -#, java-format #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." #~ msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}." @@ -30896,6 +30650,6 @@ #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -30911,6 +30665,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example, replacing 73 with your image id:\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example, replacing 73 with your image id:\n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -30922,6 +30676,6 @@ #~ "und löschen - Diese werden dann im WMS-Menü angezeigt. \n" #~ "\n" -#~ "Sie können dies in den erweiterten Einstellungen auch manuell nach folgendem " -#~ "Schema erledigen:\n" +#~ "Sie können dies in den erweiterten Einstellungen auch manuell nach " +#~ "folgendem Schema erledigen:\n" #~ "wmsplugin.url.1.name=LandSat\n" #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" @@ -30940,8 +30694,7 @@ #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" #~ "\n" -#~ "Achtung: Stellen Sie sicher, dass die Bilder urheberrechtlicht unbedenklich " -#~ "sind. Im Zweifel verzichten Sie auf die Nutzung." - -#, java-format +#~ "Achtung: Stellen Sie sicher, dass die Bilder urheberrechtlicht " +#~ "unbedenklich sind. Im Zweifel verzichten Sie auf die Nutzung." + #~ msgid "Layer {0} must be in list of layers" #~ msgstr "Lag {0} må være i listen over lag" @@ -30950,5 +30703,4 @@ #~ msgstr "Ingen data" -#, java-format #~ msgid "Remove relation member {0} {1}" #~ msgstr "Fjern relasjonsmedlem {0} {1}" @@ -30960,36 +30712,24 @@ #~ msgstr "feil ved fårespørsel om oppdatering: ikke zoom-nivå 12" -#, java-format #~ msgid "Help page missing. Create it in English." #~ msgstr "Hjelpeside mangler. Opprett den på engelsk." -#, java-format #~ msgid "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgstr "" #~ "Hjelpeside mangler. Opprett den på engelsk eller norsk (bokmål)." -#~ msgid "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" -#~ msgstr "" -#~ "Kan ikke gjøre om kommando \"{0}\" fordi lag \"{1}\" ikke lenger er " -#~ "tilgjengelig" - -#~ msgid "Didn't find an primitive with id {0} in this dataset" -#~ msgstr "Fant ikke noe objekt med ID {0} i dette datasettet" - #~ msgid "Helppage missing. Create it in English." #~ msgstr "Hjelp mangler. Kan lages i English." #~ msgid "" -#~ "Helppage missing. Create it in English or your language." +#~ "Helppage missing. Create it in English or your language." #~ msgstr "" -#~ "Hjelp mangler. Kan lages i English ellerr norsk bokmål." - -#, java-format +#~ "Hjelp mangler. Kan lages i English ellerr norsk bokmål." + #~ msgid "Unexpected return value. Got {0}." #~ msgstr "Uventet returverdi. Mottok {0}." @@ -31007,5 +30747,4 @@ #~ msgstr "Fant ingen siste versjon. Historikken er tom." -#, java-format #~ msgid "Index out of bounds. Got {0}." #~ msgstr "Indeks er utenfor rekkevidde: {0}" @@ -31014,11 +30753,10 @@ #~ msgstr "Vis historikken for det valgte objektet" -#, java-format #~ msgid "Could not read ''{0}''." #~ msgstr "Klarte ikke lese «{0}»" -#, java-format #~ msgid "" -#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''." +#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got " +#~ "''{1}''." #~ msgstr "" #~ "ugyldig verdi for obligatorisk attributt «{0}» av type «int» (>= 0) – leste "