Index: applications/editors/josm/i18n/po/nb.po =================================================================== --- applications/editors/josm/i18n/po/nb.po (revision 17103) +++ applications/editors/josm/i18n/po/nb.po (revision 17485) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-18 13:46+0200\n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" "PO-Revision-Date: 2009-08-15 13:39+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,77 +16,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:05+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/Main.java:193 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Creating main GUI" msgstr "Bygger opp hovedskjermbilde" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 +#: ../core/src/org/openstreetmap/josm/Main.java:203 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:318 msgid "Help" msgstr "Hjelp" -#: ../core/src/org/openstreetmap/josm/Main.java:289 +#: ../core/src/org/openstreetmap/josm/Main.java:296 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "Klarte ikke bruke projeksjonen {0}. Bruker Mercators projeksjon." -#: ../core/src/org/openstreetmap/josm/Main.java:290 -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45 -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/Main.java:297 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/Main.java:534 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 -#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172 -#: ../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/PluginDownloader.java:56 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:126 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../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/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 @@ -96,154 +99,160 @@ #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:282 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:289 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:218 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Error" msgstr "Feil" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "Tips: Noen endringer kom fra å laste opp nye data til tjeneren." - -#: ../core/src/org/openstreetmap/josm/Main.java:400 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/Main.java:445 +#, fuzzy, java-format +msgid "" +"There are unsaved changes in {0} layer. Discard the changes and continue?" +msgid_plural "" +"There are unsaved changes in {0} layers. Discard the changes and continue?" +msgstr[0] "Det er ulagrede endringer. Vil du forkaste endringene og fortsette?" +msgstr[1] "Det er ulagrede endringer. Vil du forkaste endringene og fortsette?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Ulagrede endringer" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Det er ulagrede endringer. Vil du forkaste endringene og fortsette?" - -#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/Main.java:453 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save and Exit" msgstr "Lagre og avslutt" -#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/Main.java:453 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Forkast og avslutt" -#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/Main.java:453 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 msgid "Cancel" msgstr "Avbryt" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Overser feilutformet URL: «{0}»" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:450 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/Main.java:478 +#: ../core/src/org/openstreetmap/josm/Main.java:497 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:92 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:144 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 msgid "Warning" msgstr "Advarsel" -#: ../core/src/org/openstreetmap/josm/Main.java:449 +#: ../core/src/org/openstreetmap/josm/Main.java:496 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Overser feilutformet fil-URL: «{0}»" + +#: ../core/src/org/openstreetmap/josm/Main.java:509 +#: ../core/src/org/openstreetmap/josm/Main.java:533 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:92 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -268,7 +277,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -306,5 +316,5 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 #: build/trans_surveyor.java:64 msgid "Info" @@ -328,6 +338,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "Plugins" msgstr "Programtillegg" @@ -342,17 +352,26 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 -#, java-format -msgid "" -"WARNING: unexpected format of API base URL. Redirection to history page for " -"OSM primitive will probably fail. API base URL is: ''{0}''" +#, fuzzy, java-format +msgid "" +"WARNING: unexpected format of API base URL. Redirection to info or history " +"page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" "Advarsel: Uventet format for API-URL. Vil sannsynligvis ikke omdirigere " "riktig til historikkside for OSM-element. API-URL er «{0}»." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, fuzzy, java-format +msgid "" +"WARNING: unexpected format of API base URL. Redirection to user page for OSM " +"user will probably fail. API base URL is: ''{0}''" +msgstr "" +"Advarsel: Uventet format for API-URL. Vil sannsynligvis ikke omdirigere " +"riktig til historikkside for OSM-element. API-URL er «{0}»." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Velg minst én allerede opplastet node, linje eller relasjon." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -362,5 +381,5 @@ "ADVARSEL: Starter leservindu kun for de første {0} av {1} valgte objektene" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Please select the target layer." msgstr "" @@ -370,11 +389,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469 msgid "Merge" msgstr "Flett" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -383,5 +402,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90 msgid "No target layers" msgstr "" @@ -398,11 +417,11 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 @@ -431,5 +450,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 msgid "Latitude" msgstr "Breddegrad" @@ -438,30 +457,30 @@ #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 msgid "Longitude" msgstr "Lengdegrad" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254 msgid "Align Nodes in Circle" msgstr "Juster nodene til en sirkel" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Flytt de valgte nodene i en sirkel." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -475,6 +494,6 @@ #: ../plugins/terracer/src/terracer/TerracerAction.java:72 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40 #, java-format @@ -482,58 +501,57 @@ msgstr "Verktøy: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Velg minst fire noder." #. FIXME: not sure whether this fits in a dialog -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:334 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111 msgid "Information" msgstr "Informasjon" #. Do it! +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131 msgid "Align Nodes in Line" msgstr "Juster nodene til en linje" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 msgid "Move the selected nodes in to a line." msgstr "Flytt valgte noder til en rett linje." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63 msgid "Please select at least three nodes." msgstr "Velg minst 3 noder" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -544,10 +562,10 @@ "er {0}, maksimalt er {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:108 msgid "API Capabilities Violation" msgstr "API-krav ikke møtt" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -557,5 +575,5 @@ "Advarsel: forkorter automatisk verdi for egenskap «{0}» i slettet objekt {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -566,46 +584,46 @@ "lengde {2}. Verdiens lengde er {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 msgid "Precondition Violation" msgstr "Forhåndsbetingelse brutt" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:103 #, 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}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "lag" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "utvalg" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "last ned" +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57 #, java-format msgid "Zoom to {0}" msgstr "Gå til {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom the view to {0}." msgstr "Skaler og flytt skjermbildet til {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -615,22 +633,22 @@ msgstr "Bilde: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124 msgid "Nothing selected to zoom to." msgstr "Inet utvalg å vise." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124 msgid "No conflicts to zoom to" msgstr "Ingen konflikter å vise." +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Combine Way" msgstr "Sammenføy linjer" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 msgid "Combine several ways into one." msgstr "Sammenføy flere linjer til én" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 msgid "Please select at least two ways to combine." msgstr "Velg minst to linjer å sammenføye." @@ -641,4 +659,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Sammenføy uansett" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -646,19 +668,7 @@ msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Sammenføy uansett" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Endre retninger?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"Linjene har forskjellig retning og kan ikke sammenføyes. Vil du snu " -"retningen på noen av linjene?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -666,27 +676,34 @@ msgstr "Snu og sammenføy" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"Linjene har forskjellig retning og kan ikke sammenføyes. Vil du snu " +"retningen på noen av linjene?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 msgid "Enter values for all conflicts." msgstr "Legg inn verdier for alle konflikter." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 msgid "Solve Conflicts" msgstr "Løs konflikter" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #, java-format msgid "Combine {0} ways" msgstr "Sammenføy {0} linjer" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 msgid "All the ways were empty" msgstr "Alle linjene var tomme" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -694,32 +711,32 @@ msgstr "Kan ikke sammenføye linjer. (Kan ikke bli sammenhengende nodestreng)" +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 msgid "Copy" msgstr "Kopier" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:33 msgid "Copy selected objects to paste buffer." msgstr "Kopier valgte objekter til utklippstavla." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:126 msgid "Please select something to copy." msgstr "Velg noe å kopiere." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 msgid "Create Circle" msgstr "Lag en sirkel" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Lag en sirkel fra tre valgte noder." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 msgid "Those nodes are not in a circle. Aborting." msgstr "Disse nodene er ikke i en sirkel. Avbryter." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -731,20 +748,20 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Slett" @@ -754,85 +771,86 @@ msgstr "Slett valgte objekter." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194 msgid "Overwrite" msgstr "Skriv over" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193 msgid "File exists. Overwrite?" msgstr "Filen finnes. Vil du overskrive filen?" #. Do it! +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132 msgid "Distribute Nodes" msgstr "Jevn fordeling av noder" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 msgid "Distribute the selected nodes to equal distances along a line." msgstr "Fordel valgte noder med lik avstand etter en linje." +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 msgid "Download from OSM..." msgstr "Last ned fra OSM …" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 msgid "Download map data from the OSM server." msgstr "Last ned kartdata fra OSM-tjeneren." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 #, java-format msgid "File: {0}" msgstr "Fil: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Last ned" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74 msgid "Please select at least one task to download" msgstr "Velg minst én oppgave å laste ned" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download primitives referring to one of the selected primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 msgid "Download referrers..." msgstr "Last ned referansene ..." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." msgstr "Det oppstod {0} konflikter under import." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -841,6 +859,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415 msgid "Duplicate" msgstr "Fordoble" @@ -864,85 +882,91 @@ msgstr "Avslutt programmet." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Alle bilder" + +#: ../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/gui/layer/Layer.java:214 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 msgid "Export to GPX..." msgstr "Eksporter til GPX …" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 msgid "Export the data to GPX file." msgstr "Eksporter dataene til GPX-fil." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Ingenting å eksportere. Hent inn data først." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56 -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 #, java-format msgid "paramenter ''{0}'' must not be null" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58 +#: ../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:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Eksporter GPX fil" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "JOSM hjelpesider" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 msgid "Open in Browser" msgstr "Åpne i nettleser" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264 +#: ../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:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633 msgid "Edit" msgstr "Endre" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Last inn på nytt" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:114 msgid "Can only edit help pages from JOSM Online Help" msgstr "Du kan bare redigere hjelpesider fra JOSM Online Help" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:199 #, java-format msgid "Error while loading page {0}" msgstr "Feil ved nedlasting av {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format msgid "Help page missing. Create it in english." msgstr "Hjelpeside mangler. Opprett den på engelsk." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -996,22 +1020,26 @@ msgstr "Flett det gjeldende laget inn i et annet lag" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 msgid "Merge Nodes" msgstr "Samle noder" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Merge nodes into the oldest one." msgstr "Samle noder i den eldste" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77 msgid "Please select at least two nodes to merge." msgstr "Velg minst to noder til å samle" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 msgid "Merge nodes with different memberships?" msgstr "Samle noder med forskjellige relasjoner?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Samle noder allikevel" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1021,77 +1049,73 @@ "samle noder?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Samle noder allikevel" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "Kan ikke samle noder. Ville ha måttet slette en linje som er i bruk." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 #, java-format msgid "Merge {0} nodes" msgstr "Samle {0} noder" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 msgid "Merge selection" msgstr "Flett utvalgte" -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75 msgid "Mirror" msgstr "Speilvend" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 msgid "Mirror selected nodes and ways." msgstr "Speilvend valgte noder og linjer" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 msgid "Please select at least one node or way." msgstr "Velg minst én node eller linje." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "opp" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 #, java-format msgid "Move objects {0}" msgstr "Flytt objektene {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "ned" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "venstre" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "høyre" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Flytt {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Moves Objects {0}" msgstr "Flytter Objekter {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 msgid "Cannot move objects outside of the world." msgstr "Kan ikke flytte objekter utenfor kartet." @@ -1099,5 +1123,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337 msgid "New" msgstr "Ny" @@ -1107,17 +1131,22 @@ msgstr "Lag et nytt kart." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 msgid "Open..." msgstr "Åpne …" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Åpne en fil." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Åpne en fil." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Ukjent rolle «{0}»." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1155,21 +1184,17 @@ msgstr "Flytt noder så alle vinkler blir 90 eller 270 grader" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Bare to noder tillatt" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 msgid "Selection must consist only of ways." msgstr "Du kan bare velge linjer." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select one or more closed ways of at least four nodes." msgstr "Velg en eller flere lukkede linjer med minst fire noder." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "Velg linjer med tilnærmet vinkelrette knekk for vinkling." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1178,9 +1203,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 msgid "Only one node selected" msgstr "Bare én node er valgt" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Vinkle (90)" @@ -1196,13 +1221,26 @@ msgstr "Lim inn fra utklippstavla." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Lim inn egenskaper" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Bruk egenskaper i utklippstavla på alle valgte element." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, fuzzy, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Laster {0}" +msgstr[1] "Laster {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, fuzzy, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "Gjenopprett {0} objekter" +msgstr[1] "Gjenopprett {0} objekter" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1228,37 +1266,32 @@ msgstr "Gjør om siste angrede handling." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 msgid "Rename layer" msgstr "Endre navn på lag" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Gi nytt navn på fil også" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 -#, java-format -msgid "Warning: failed to put a dialog always on top. Exception was: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 #, java-format msgid "Could not rename file ''{0}''" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Snu retning på linjer" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Snu retning på alle valgte linjer" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 msgid "Please select at least one way." msgstr "Velg minst én linje" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Snu retning på linjer" @@ -1266,10 +1299,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 msgid "Save" msgstr "Lagre" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 msgid "Save the current data." msgstr "Lagre gjeldende data." @@ -1280,36 +1314,25 @@ msgstr "Filen {0} finnes allerede. Vil du skrive over den?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 msgid "No Exporter found! Nothing saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94 -msgid "" -"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." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Ingen åpne dokument å lagre" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Tomt dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "The document contains no data." msgstr "Dokumentet er tomt." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Lagre uansett" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Konflikter" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1319,28 +1342,28 @@ "du fortsette?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Avvis konflikter og lagre" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Lagre OSM-fil" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Lagre GPX-fil" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Lagre lag" +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 msgid "Save As..." msgstr "Lagre som …" -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 msgid "Save the current data to a new file." msgstr "Lagre aktive data i ny fil." @@ -1372,33 +1395,33 @@ msgstr "Hjelp: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Statusrapport" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 msgid "Copy to clipboard and close" msgstr "Kopier til utklippstavlen og lukk" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:245 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Close" msgstr "Lukk" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 msgid "Split Way" msgstr "Splitt linje" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 msgid "Split a way at the selected node." msgstr "Splitt en linje i den valgte noden." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 msgid "The current selection cannot be used for splitting." msgstr "Kan ikke splitte med dette utvalget" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1406,5 +1429,5 @@ msgstr[1] "Valgte noder er ikke del av en linje." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1416,9 +1439,9 @@ msgstr[1] "Mer enn én linje bruker de valgte nodene. Velg flere linjer." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected nodes do not share the same way." msgstr "Valgte noder er ikke på samme linje." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1426,10 +1449,10 @@ msgstr[1] "Valgt linje inneholder ikke de valgte nodene." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251 msgid "You must select two or more nodes to split a circular way." msgstr "Velg to eller fler noder for å splitte sirkelformet linje." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1439,5 +1462,5 @@ "linjen.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1445,5 +1468,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1451,8 +1474,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 #, java-format msgid "Split way {0} into {1} parts" msgstr "Splitt linje {0} i {1} deler" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Lukker endringssett …" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29 +#, fuzzy +msgid "Close the current changeset ..." +msgstr "Lukker endringssett …" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 +msgid "There is currently no changeset open." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 +#, fuzzy +msgid "No open changeset" +msgstr "Åpner endringssett …" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Lukker endringssett …" #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1470,57 +1518,57 @@ msgstr "Slår av/på global innstilling «{0}»." +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 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:51 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:83 +#: ../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:108 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 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:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 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:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 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:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Velg:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* En node med egenskaper, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 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:124 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 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:124 +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"– En linje som har en eller flere noder, som er brukt av flere linjer, eller" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 -msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"– En linje som har en eller flere noder, som er brukt av flere linjer, eller" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 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:128 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1533,9 +1581,9 @@ "kopier og alle noder bli valgt." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Node uten tilknytning" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 #, java-format msgid "Dupe into {0} nodes" @@ -1543,5 +1591,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1585,61 +1633,71 @@ msgstr "Oppdaterer aktuelt datalag fra tjeneren (laster ned på nytt)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#. bounds defined? => use the bbox downloader +#. +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77 +msgid "Updating data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Oppdater utvalg" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 msgid "Updates the currently selected primitives from the server" msgstr "Oppdaterer de valgte objektene fra tjeneren" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 msgid "There are no selected primitives to update." msgstr "Det er ingen valgte objekter å oppdatere" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" msgstr "Utvalget er tomt" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 msgid "Upload to OSM..." msgstr "Last opp til OSM …" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 msgid "Upload all changes to the OSM server." msgstr "Last opp alle endringer til OSM-tjeneren." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135 +#, fuzzy, java-format +msgid "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." +msgstr "Data inneholder uløste konflikter som først må løses." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Ingen endringer å laste opp. Finn frem data først." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "Data inneholder uløste konflikter som først må løses." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Ingen endringer å laste opp." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 #, java-format msgid "Synchronize {0} {1} only" msgstr "Synkroniser kun {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 msgid "Synchronize entire dataset" msgstr "Synkroniser hele datasettet" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1660,17 +1718,17 @@ "strong> for å gå tilbake og fortsette å redigere.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280 msgid "Conflict detected" msgstr "Konflikt oppdaget" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293 #, java-format msgid "unexpected return value. Got {0}" msgstr "Uventet returverdi. Mottok {0}." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1685,32 +1743,70 @@ "strong> for å avbryte operasjonen og fortsette å redigere.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "Advarsel: Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347 #, java-format msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396 #, java-format msgid "Uploading failed.
{0}" msgstr "Opplasting feilet.
{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405 msgid "Upload to OSM API failed" msgstr "Klarte ikke laste opp til OSM-API" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 msgid "Updating primitive" msgstr "Oppdaterer objekt" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 +msgid "Upload these changes?" +msgstr "Laste opp disse endringene?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Last opp endringer" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, fuzzy, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Rediger ny relasjon i lag \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:651 +msgid "Use a new changeset and close it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:652 +msgid "" +"Select to upload the data using a new changeset and to close the changeset " +"after the upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:655 +msgid "Use a new changeset and leave it open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +msgid "" +"Select to upload the data using a new changeset and to leave the changeset " +"open after the upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:658 +#, fuzzy +msgid "Upload to a new or to an existing changeset?" +msgstr "Legg til en node i eksisterende linje" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 msgid "upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1718,31 +1814,80 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Gi en kort kommentar for endringene du laster opp:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Innstillinger for kart" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 +#, fuzzy +msgid "Tags of new changeset" +msgstr "endringssett" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Objekter som legges til:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Objekter som endres:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Objekter som slettes:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Gi en kort kommentar for endringene du laster opp:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Laste opp disse endringene?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Last opp endringer" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 -msgid "Uploading" -msgstr "Laster opp" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:803 +#, fuzzy, java-format +msgid "{0} object to add:" +msgid_plural "{0} objects to add:" +msgstr[0] "Objekter som legges til:" +msgstr[1] "Objekter som legges til:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:812 +#, fuzzy, java-format +msgid "{0} object to modifiy:" +msgid_plural "{0} objects to modify:" +msgstr[0] "Objekter som endres:" +msgstr[1] "Objekter som endres:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:821 +#, fuzzy, java-format +msgid "{0} object to delete:" +msgid_plural "{0} objects to delete:" +msgstr[0] "Objekter som slettes:" +msgstr[1] "Objekter som slettes:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:910 +#, java-format +msgid "Use the existing changeset {0} and close it after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:911 +#, java-format +msgid "" +"Select to upload to the existing changeset {0} and to close the changeset " +"after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:914 +#, java-format +msgid "Use the existing changeset {0} and leave it open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:915 +#, java-format +msgid "" +"Select to upload to the existing changeset {0} and to leave the changeset " +"open for further uploads" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:942 +#, fuzzy, java-format +msgid "Tags of changeset {0}" +msgstr "Siste endring på {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1766,20 +1911,20 @@ #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -#: ../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/AudioFwdAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 #: ../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:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 #, java-format msgid "Audio: {0}" msgstr "Audio: {0}" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 msgid "Faster" msgstr "Raskere" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Rask Avspilling" @@ -1821,10 +1966,10 @@ msgstr "Spill av forrige merke" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 msgid "Slower" msgstr "Saktere" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Spill av sakte" @@ -1852,31 +1997,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:119 msgid "No data imported." msgstr "Ingenting er importert." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 msgid "OpenStreetMap data" msgstr "OpenStreetMap-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Last ned {0} av {1} ({2} gjenstår)" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 -msgid "Updating data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 #, java-format msgid "The following errors occurred during mass download:{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 msgid "Errors during Download" msgstr "Feil under nedlasting" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1893,20 +2034,20 @@ "{2} for å ignorere.
" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191 msgid "Deleted or moved primitives" msgstr "Slettede eller flyttede objekter" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 msgid "Delete Mode" msgstr "Slettemodus" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 msgid "Delete nodes or ways." msgstr "Slett noder eller linjer." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -1915,5 +2056,5 @@ msgstr "Modus: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1923,55 +2064,69 @@ "når linjer slettes. Ctrl: slett objekt med referanse." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../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/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../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:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:287 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../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:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 +#: ../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/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 msgid "Draw" msgstr "Tegn" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Tegn noder" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 msgid "Mode: Draw Focus" msgstr "Modus: Tegne Fokus" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 @@ -1979,38 +2134,38 @@ msgstr "valgt" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:358 msgid "Cannot add a node outside of the world." msgstr "Kan ikke legge til node utenfor kartet." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Legg til node" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:532 msgid "Add node into way" msgstr "Legg til node i linje" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 msgid "Connect existing way to node" msgstr "Knytt eksisterende linje til node" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542 msgid "Add a new node to an existing way" msgstr "Legg til en node i eksisterende linje" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:544 msgid "Add node into way and connect" msgstr "Legg til node i linje og lag tilknytning" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930 msgid "Create new node." msgstr "Lag ny node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 msgid "Select node under cursor." msgstr "Veg node under pekeren." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937 #, java-format msgid "Insert new node into way." @@ -2019,14 +2174,14 @@ msgstr[1] "Sett inn ny node i {0} linjer." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947 msgid "Start new way from last node." msgstr "Start ny linje fra siste node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949 msgid "Continue way from last node." msgstr "Fortsett samme linje fra siste node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972 msgid "Finish drawing." msgstr "Avslutt tegning." @@ -2046,5 +2201,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Slipp museknappen for å velge objektene i rektangelet." @@ -2055,5 +2210,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "Release the mouse button to stop rotating." msgstr "Slipp museknappen for å avslutte rotasjon." @@ -2071,17 +2226,18 @@ "+slipp synkroniserer audio i dette punktet." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110 #: ../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/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:95 msgid "Select" msgstr "Velg" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110 msgid "Select, move and rotate objects" msgstr "Velg, flytt og roter objekt" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211 #, java-format msgid "Add and move a virtual new node to way" @@ -2090,13 +2246,21 @@ msgstr[1] "Legg til og flytt en kunstig node til {0} linjer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Flytt elementer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Move them" +msgstr "Flytt dem" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Undo move" +msgstr "Angre flytting" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#, fuzzy, java-format +msgid "" +"You moved more than {0} elements. Moving a large number of elements is often " +"an error.\n" "Really move them?" msgstr "" @@ -2104,13 +2268,9 @@ "ofte en feil." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Move them" -msgstr "Flytt dem" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Undo move" -msgstr "Angre flytting" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 +msgid "Always move and don't show dialog again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2119,5 +2279,5 @@ "nærmeste node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2145,60 +2305,60 @@ "piltaster; flytt utsnitt med høyre museknapp" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43 msgid "Search..." msgstr "Søk …" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search for objects." msgstr "Søk etter objekt." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51 msgid "Can't search because there is no loaded data." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65 msgid "Please enter a search string." msgstr "Skriv inn søketekst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "erstatt utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 msgid "add to selection" msgstr "legg til i utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 msgid "remove from selection" msgstr "fjern fra utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "skill mellom store/små bokstaver" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "regulært uttrykk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 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:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 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:95 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Nan – «Nan» finnes innen navnet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 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:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2208,66 +2368,67 @@ "*=value, type=, *=*, *=." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 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:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 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:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Special targets:" msgstr "Spesialsøk:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 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:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "user:... - all objects changed by user" msgstr "user:… – alle objekter redigert av angitt bruker" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:… – objekt med angitt ID" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "id:… – objekt med angitt ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "nodes:... - object with given number of nodes" msgstr "nodes:… – objekt med angitt antall noder" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "modified - all changed objects" msgstr "modified – alle endrede objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "selected - all selected objects" msgstr "selected – alle objekter i utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "incomplete - all incomplete objects" msgstr "incomplete – alle uferdige objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "untagged - all untagged objects" msgstr "untagged – alle objekter uten egenskaper" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" +"child uttrykk – alle underobjekter av objektene i uttrykket" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" -"child expr - all children of objects matching the expression" -msgstr "" -"child uttrykk – alle underobjekter av objektene i uttrykket" +"parent expr - all parents of objects matching the expression" +msgstr "" +"parent uttrykk – alle overobjekter av objektene i uttrykket" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" -"parent uttrykk – alle overobjekter av objektene i uttrykket" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 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:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2275,46 +2436,46 @@ "«:»)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Use ( and ) to group expressions" msgstr "Bruk ( og ) for å gruppere uttrykk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Søk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Start søk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 #, java-format msgid "No match found for ''{0}''" msgstr "Fant ingen treff for «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 #, 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:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 #, 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:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208 #, java-format msgid "Found {0} matches" msgstr "Fant {0} treff" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 msgid "RX" msgstr "RX" @@ -2381,58 +2542,96 @@ msgstr "Ugyldig verdi for id-operator: {0}. Verdien må være et tall." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Les inn utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45 #, java-format msgid "Contact {0}..." msgstr "Koble til {0} …" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Laster ned …" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:63 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:80 #, java-format msgid "Could not read from URL: \"{0}\"" msgstr "Klarte ikke lese fra URL: «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:83 #, java-format msgid "Parsing error in URL: \"{0}\"" msgstr "Feil i URL: «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:87 msgid "Error while communicating with server." msgstr "Feil ved tjenerkommunikasjon." -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65 -#, java-format -msgid "Add {0} {1}" +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 +#, fuzzy, java-format +msgid "Add node {0}" +msgstr "Legg til node" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, fuzzy, java-format +msgid "Add way {0}" msgstr "Legg til {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 +#, fuzzy, java-format +msgid "Add relation {0}" +msgstr "Relasjoner: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" msgstr "Endre {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Endre {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Skift relasjon" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "Fjern «{0}» i {1} «{2}»" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Fjern «{0}» i {1} «{2}»" + #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" +#, fuzzy, java-format +msgid "Remove \"{0}\" for relation ''{1}''" +msgstr "Fjern «{0}» i {1} «{2}»" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Sett {0}={1} i {2} «{3}»" -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:124 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:125 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 +#, fuzzy, java-format +msgid "Set {0}={1} for way ''{2}''" +msgstr "Sett {0}={1} i {2} «{3}»" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Sett {0}={1} i {2} «{3}»" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 +#: ../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" @@ -2441,10 +2640,10 @@ msgstr[1] "objekter" -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#: ../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:115 +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118 #, java-format msgid "Set {0}={1} for {2} {3}" @@ -2456,5 +2655,5 @@ msgstr "Endre rolle for relasjonsmedlem {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2463,10 +2662,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149 msgid "Double conflict" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2475,5 +2674,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 #, java-format msgid "Add conflict for ''{0}''" @@ -2499,44 +2698,60 @@ msgstr "kan ikke løse uavgjort konflikt" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Slett {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Slett {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:173 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:127 +#, fuzzy, java-format +msgid "Delete {0} object" +msgid_plural "Delete {0} objects" +msgstr[0] "Slett {0} {1}" +msgstr[1] "Slett {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132 +#, fuzzy, java-format +msgid "Delete {0} node" +msgid_plural "Delete {0} nodes" +msgstr[0] "Slettemodus" +msgstr[1] "Slettemodus" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Slett {0} {1}" +msgstr[1] "Slett {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134 +#, fuzzy, java-format +msgid "Delete {0} relation" +msgid_plural "Delete {0} relations" +msgstr[0] "Slett fra relasjon" +msgstr[1] "Slett fra relasjon" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Relasjonen har konflikter" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:174 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +msgid "Delete from relation" +msgstr "Slett fra relasjon" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#, fuzzy, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " +"from relation?" msgstr "" "Utvalg «{0}» brukes av relasjon «{1}» med rolle {2}.\n" "Vil du slette utvalget fra relasjonen?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852 -msgid "Delete from relation" -msgstr "Slett fra relasjon" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#, fuzzy, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" +"" msgstr "" "Utvalg «{0}» brukes av relasjon «{1}».\n" "Vil du slette utvalget fra relasjonen?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Splitt linje i segment" @@ -2544,6 +2759,6 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:141 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -2555,5 +2770,5 @@ "nå) .
Er du sikker på at du vil slette nodene?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "" @@ -2564,5 +2779,5 @@ msgstr "Løs slettekonflikt i {0}" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2599,10 +2814,20 @@ msgstr "Løs medlemskonflikter i relasjon {0}" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "Fjern relasjonsmedlem {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 +#, java-format +msgid "Remove node ''{0}'' at position {1} from relation ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70 +#, java-format +msgid "Remove way ''{0}'' at position {1} from relation ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71 +#, java-format +msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141 #, java-format msgid "Rotate {0} node" @@ -2615,17 +2840,37 @@ msgstr "Sekvens" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in node {1}" msgstr "Løs {0} egenskapskonflikter i {1} {2}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in way {1}" +msgstr "Løs {0} egenskapskonflikter i {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Løs {0} egenskapskonflikter i {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "Gjenopprett {0} objekter" -#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 -#, java-format -msgid "Resolve version conflicts for {0} {1}" +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 +#, fuzzy, java-format +msgid "Resolve version conflicts for node {0}" +msgstr "Løs versjonskonflikter for {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Løs versjonskonflikter for {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" msgstr "Løs versjonskonflikter for {0} {1}" @@ -2652,13 +2897,13 @@ "opprettholde dataintegritet." -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Relasjon" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Tidligere rolle" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Ny rolle" @@ -2677,62 +2922,121 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 msgid "New value" msgstr "Ny verdi" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Bruk valgte endringer" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Ikke bruk endringer" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:85 msgid "Please select which property changes you want to apply." msgstr "Velg hvilke endringer som skal brukes." -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Egenskaper for " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:123 msgid "Roles in relations referring to" msgstr "Roller i relasjoner som viser til" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 msgid "Automatic tag correction" msgstr "Korriger egenskap automatisk" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263 +#, java-format +msgid "Warning: failed to persist preferences to ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368 #, java-format msgid "Malformed config file at lines {0}" msgstr "Innstillingsfil har feil i linje {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Kan ikke åpne innstillingsmappe: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377 +#, fuzzy, java-format +msgid "" +"Warning: Failed to initialize preferences. Preference directory ''{0}'' " +"isn't a directory." +msgstr "" +"Klarte ikke sette referanse. Referanse-ID {0} er ikke tilgjengelig i " +"historikken." + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380 +#, java-format +msgid "" +"Failed to initialize preferences.
Preference directory ''{0}'' " +"isn't a directory." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388 +#, java-format +msgid "" +"Warning: Failed to initialize preferences. Failed to create missing " +"preference directory: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391 +#, java-format +msgid "" +"Failed to initialize preferences.
Failed to create missing " +"preference directory: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#, java-format +msgid "" +"Warning: Missing preference file ''{0}''. Creating a default preference file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#, java-format +msgid "" +"Warning: Replacing existing preference file ''{0}'' with default preference " +"file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#, java-format +msgid "" +"Failed to initialize preferences.
Failed to reset preference file " +"to default: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#, fuzzy, java-format +msgid "" +"Preferences file had errors.
Making backup of old one to
{0}" +"
and creating a new default preference file." msgstr "Feil i innstillingsfila. Lagrer sikkerhetskopi i {0}." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 +#, java-format +msgid "" +"Warning: Failed to initialize preferences.Failed to reset preference file to " +"default: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87 #, java-format msgid "Preferences stored on {0}" msgstr "Innstillinger lagret i {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Kunne ikke laste opp innstillinger. Årsak: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111 msgid "Could not load preferences from server." msgstr "Klarte ikke lese innstillinger fra tjener." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2746,29 +3050,36 @@ msgstr "allerede registrert en konflikt for primitiv \"{0}\"" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +#. * +#. * the decimal format 999.999 +#. +#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" msgstr "Desimalgrader" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32 +#. * +#. * the minutes/seconds format 99" 99' +#. +#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" msgstr "Grader, minutter, sekunder" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "S" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "N" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "V" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "Ø" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:44 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #, java-format msgid "Changeset {0}" @@ -2780,15 +3091,232 @@ msgstr "parameter {0} > 0 nødvendig. Leste {1}." -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186 -msgid "incomplete" -msgstr "uferdig" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Error: {0}" +msgstr "Feil: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Advarsel: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +msgid "a primitive with id=0 can't be invisible" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 +#, 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:38 +#, 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/TagCollection.java:571 +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:605 +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:623 +msgid "" +"tag collection can't be applied to a primitive because there are keys with " +"multiple values" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154 +msgid "There's no primitive with version {0} in this history" +msgstr "Denne historikken har ikke noe element med versjon {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161 +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163 +msgid "There's no version valid at date ''{0}'' in this history" +msgstr "Denne historikken har ikke noen gyldig versjon for dato «{0}»" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, 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/History.java:180 +msgid "no earliest version found. History is empty." +msgstr "Fant ingen første versjon. Historikken er tom." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186 +msgid "no latest version found. History is empty." +msgstr "Fant ingen siste versjon. Historikken er tom." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +msgid "Didn't find an primitive with id {0} in this dataset" +msgstr "Fant ikke noe objekt med ID {0} i dette datasettet" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:84 +msgid "Didn't find an primitive with id {0} and version {1} in this dataset" +msgstr "Fant ikke noe objekt med ID {0} og versjon {1} i dette datasettet" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34 +#, 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:104 +msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''" +msgstr "klarte ikke sammenlikne element med ID «{0}» og element med ID «{1}»" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48 +#, java-format +msgid "parameter {0} not in range 0..{1}, got {2}" +msgstr "parameter {0} er ikke i intervall 0–{1} – leste {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +msgid "Area style way is not closed." +msgstr "Linje for areal er ikke lukket." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "multipolygon-linje «{0}» er ikke lukket." + +#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed +#. TODO Remove useless nullcheck when RelationMember.member is encalupsed +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:835 +msgid "Empty member in relation." +msgstr "Tomt medlem i relasjon." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:837 +#, java-format +msgid "Deleted member ''{0}'' in relation." +msgstr "Slettet medlem «{0}» i relasjon." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:848 +#, java-format +msgid "Way ''{0}'' with less than two points." +msgstr "Linje «{0}» med færre enn to punkter." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "Fant mer enn én linje med «from»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "Fant mer enn én linje med «to»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625 +msgid "More than one \"via\" found." +msgstr "Fant mer enn én \"via\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#, java-format +msgid "Unknown role ''{0}''." +msgstr "Ukjent rolle «{0}»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "Ukjent medlemstype for «{0}»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "Fant ingen linje med «from»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "Fant ingen linje med «to»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "Fant ingen node eller linje med «via»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:656 +msgid "The \"from\" way doesn't 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/MapPaintVisitor.java:660 +msgid "The \"to\" way doesn't 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/MapPaintVisitor.java:673 +msgid "The \"from\" way doesn't 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/MapPaintVisitor.java:677 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "linje med «to» har ikke start eller slutt i en «via»-linje." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "Fant ikke stil for restriksjon {0}." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "Multipolygon-medlem «{0}» er ikke en linje." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "Ingen ytre linje for multipolygon «{0}»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "Skjæring mellom linjene «{0}» og «{1}»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "Indre linje «{0}» er utenfor." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "Stil for indre linje «{0}» er samme som multipolygon." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "Stil for ytre linje «{0}» passer ikke." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "Uten egenskaper" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "tekst" + +#. should not happen +#. +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242 +#, java-format +msgid "" +"My primitive with id {0} and version {1} is visible although their primitive " +"with lower version {2} is not visible. Can't deal with this inconsistency. " +"Keeping my primitive. " +msgstr "" +"Lokalt element med ID {0} og versjon {1} er synlig selv om tjenerens element " +"med lavere versjon {2} ikke er synlig. Kan ikke håndtere denne " +"selvmotsigelsen. Beholder lokalt element. " + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "inaktiv" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -2797,22 +3325,7 @@ msgstr[1] "noder" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Feil: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Advarsel: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -msgid "nodes" -msgstr "noder" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -2821,12 +3334,7 @@ msgstr[1] "linjer" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -msgid "ways" -msgstr "linjer" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -2835,249 +3343,4 @@ msgstr[1] "relasjoner" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -msgid "relations" -msgstr "relasjoner" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changeset" -msgstr "endringssett" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changesets" -msgstr "endringssett" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 -#, 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:52 -#, 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/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} medlem" -msgstr[1] "{0} medlemmer" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "ferdselsvei" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "jernbane" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "vannvei" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "bruk av grunn" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 -#, java-format -msgid "{0} node" -msgid_plural "{0} nodes" -msgstr[0] "{0} node" -msgstr[1] "{0} noder" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "Denne historikken har ikke noe element med versjon {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:160 -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:162 -msgid "There's no version valid at date ''{0}'' in this history" -msgstr "Denne historikken har ikke noen gyldig versjon for dato «{0}»" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, 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/History.java:179 -msgid "no earliest version found. History is empty." -msgstr "Fant ingen første versjon. Historikken er tom." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185 -msgid "no latest version found. History is empty." -msgstr "Fant ingen siste versjon. Historikken er tom." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30 -msgid "Didn't find an primitive with id {0} in this dataset" -msgstr "Fant ikke noe objekt med ID {0} i dette datasettet" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36 -msgid "Didn't find an primitive with id {0} and version {1} in this dataset" -msgstr "Fant ikke noe objekt med ID {0} og versjon {1} i dette datasettet" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33 -#, 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:104 -msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''" -msgstr "klarte ikke sammenlikne element med ID «{0}» og element med ID «{1}»" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48 -#, java-format -msgid "parameter {0} not in range 0..{1}, got {2}" -msgstr "parameter {0} er ikke i intervall 0–{1} – leste {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 -msgid "Area style way is not closed." -msgstr "Linje for areal er ikke lukket." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "multipolygon-linje «{0}» er ikke lukket." - -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787 -msgid "Empty member in relation." -msgstr "Tomt medlem i relasjon." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 -#, java-format -msgid "Deleted member ''{0}'' in relation." -msgstr "Slettet medlem «{0}» i relasjon." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 -#, java-format -msgid "Way ''{0}'' with less than two points." -msgstr "Linje «{0}» med færre enn to punkter." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "Fant mer enn én linje med «from»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "Fant mer enn én linje med «to»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 -msgid "More than one \"via\" found." -msgstr "Fant mer enn én \"via\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 -#, java-format -msgid "Unknown role ''{0}''." -msgstr "Ukjent rolle «{0}»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "Ukjent medlemstype for «{0}»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "Fant ingen linje med «from»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "Fant ingen linje med «to»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "Fant ingen node eller linje med «via»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614 -msgid "The \"from\" way doesn't 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/MapPaintVisitor.java:618 -msgid "The \"to\" way doesn't 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/MapPaintVisitor.java:630 -msgid "The \"from\" way doesn't 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/MapPaintVisitor.java:634 -msgid "The \"to\" way doesn't start or end at the \"via\" way." -msgstr "linje med «to» har ikke start eller slutt i en «via»-linje." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "Fant ikke stil for restriksjon {0}." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "Multipolygon-medlem «{0}» er ikke en linje." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "Ingen ytre linje for multipolygon «{0}»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "Skjæring mellom linjene «{0}» og «{1}»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "Indre linje «{0}» er utenfor." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "Stil for indre linje «{0}» er samme som multipolygon." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "Stil for ytre linje «{0}» passer ikke." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "Uten egenskaper" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "tekst" - -#. should not happen -#. -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242 -#, java-format -msgid "" -"My primitive with id {0} and version {1} is visible although their primitive " -"with lower version {2} is not visible. Can't deal with this inconsistency. " -"Keeping my primitive. " -msgstr "" -"Lokalt element med ID {0} og versjon {1} er synlig selv om tjenerens element " -"med lavere versjon {2} ikke er synlig. Kan ikke håndtere denne " -"selvmotsigelsen. Beholder lokalt element. " - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "inaktiv" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" @@ -3090,5 +3353,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "bakgrunn" @@ -3098,5 +3361,5 @@ msgstr "fremhevet" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "" @@ -3106,5 +3369,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3120,21 +3383,21 @@ "og start et nytt lag i en annen sone." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Lambert-sone (Frankrike)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "Lambert-sone (Estland)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "Swiss Grid (Sveits)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3155,8 +3418,8 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 #, java-format -msgid "Could not read bookmarks.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" @@ -3164,17 +3427,103 @@ #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "Ikke vis igjen" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41 -#, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 +#, java-format +msgid " [id: {0}]" +msgstr " [id: {0}]" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 +msgid "incomplete" +msgstr "uferdig" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "ferdselsvei" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "jernbane" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "vannvei" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "bruk av grunn" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 +#, java-format +msgid "{0} node" +msgid_plural "{0} nodes" +msgstr[0] "{0} node" +msgstr[1] "{0} noder" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} medlem" +msgstr[1] "{0} medlemmer" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 +#, fuzzy, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.
Check " +"the server URL in your preferences and your internet connection." msgstr "" "Klarte ikke starte kommunikasjonen med OSM-tjener {0}.\n" "Sjekk tjeneradressen i innstillingene og at internett-tilkoblingen virker." -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60 +#. item "Ways/Cycleway" combo "Pedestrians" +#. item "Ways/Footway" combo "Bikes" +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:58 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:228 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 +#: build/trans_presets.java:323 build/trans_presets.java:324 +#: build/trans_presets.java:325 build/trans_presets.java:326 +#: build/trans_presets.java:327 build/trans_presets.java:328 +#: build/trans_presets.java:329 build/trans_presets.java:330 +#: build/trans_presets.java:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:449 +#: build/trans_presets.java:469 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_presets.java:773 +#: build/trans_presets.java:788 build/trans_presets.java:1330 +#: build/trans_presets.java:1397 build/trans_presets.java:1398 +#: build/trans_presets.java:1399 build/trans_presets.java:2439 +#: build/trans_presets.java:2440 build/trans_presets.java:2441 +msgid "unknown" +msgstr "ukjent" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61 +#, java-format +msgid "" +"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " +"changeset will automatically be closed by the server after a timeout." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81 #, java-format msgid "" @@ -3186,36 +3535,9 @@ "datasett
bryter en forhåndsbetingelse.
Feilmelding:
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 msgid "Precondition violation" msgstr "Forhåndsbetingelse brutt" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102 -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 -#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_presets.java:768 -#: build/trans_presets.java:783 build/trans_presets.java:1325 -#: build/trans_presets.java:1387 -msgid "unknown" -msgstr "ukjent" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3225,9 +3547,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139 msgid "Security exception" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:154 #, java-format msgid "" @@ -3236,9 +3558,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 msgid "Network exception" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179 #, java-format msgid "" @@ -3247,9 +3569,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:189 msgid "IO Exception" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:203 +#, 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/gui/ExceptionDialogUtil.java:213 +msgid "Internal Server Error" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:235 #, java-format msgid "" @@ -3259,9 +3592,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Ukjent vert" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3274,12 +3607,7 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 msgid "Primitive already deleted" msgstr "Objekt allerede slettet" - -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 -#, java-format -msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 @@ -3296,38 +3624,38 @@ msgstr "Laster ned \"Dagens melding\"" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Last opp innstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 msgid "Upload the current preferences to the server" msgstr "Last opp aktive innstillinger til tjener" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "streng" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Brukernavn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "Passord hos OSM." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../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)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "string;string;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3337,5 +3665,5 @@ "lat=y&lon=x&zoom=z, eller filnavn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3345,5 +3673,5 @@ "lat=y&lon=x&zoom=z, eller filnavn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3353,75 +3681,94 @@ "som returnerer osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "enhver" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../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." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162 msgid "Username" msgstr "Brukernavn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 msgid "Password" msgstr "Passord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "bruk" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "innstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Vis hjelp" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "Standard Unix-geometri" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box" msgstr "Last ned områdeavgrensing" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Last ned området i URL (with lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Open file (as raw gps, if .gpx)" msgstr "Åpne fil (som rå gps, dersom .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Download the bounding box as raw gps" msgstr "Last ned områdeavgrensing som rå gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Select with the given search" msgstr "Velg med gitt søkestreng" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "Launch in maximized mode" msgstr "Start maksimert" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 msgid "Reset the preferences to default" msgstr "Gå tilbake til standardinnstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Velg språk" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +msgid "options provided as Java system properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +msgid "/PATH/TO/JOSM/FOLDER/ " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +msgid "Change the folder for all user settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +msgid "" +"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " +"the following\n" +" Java option to increase the maximum size of allocated memory" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "examples" msgstr "eksempler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3431,47 +3778,47 @@ "du prøver --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "Instead of --download= you may specify osm://\n" msgstr "I stedet for --download= kan du bruke osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 msgid "Activating updated plugins" msgstr "Gjør opplastede programtillegg tilgjengelig" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Laster første programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Setter standardverdier" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Laster inn programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:185 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Innstilligen {0} er fjernet fordi den ikke lenger brukes." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Fil" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Vis" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Verktøy" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Objektmaler" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 @@ -3483,21 +3830,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:234 msgid "Wireframe View" msgstr "Vis akselinjer" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Slå av/på akselinjer" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Fullskjerm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Slå av/på fullskjerm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Audio" @@ -3537,58 +3884,44 @@ msgstr "Forminsk" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "målestokk" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93 msgid "The geographic longitude at the mouse pointer." msgstr "Lengdegrad ved musepekeren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The name of the object at the mouse pointer." msgstr "Navn på objekt ved musepeker" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The geographic latitude at the mouse pointer." msgstr "Breddegrad ved musepekeren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 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:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The (compass) heading of the line segment being drawn." msgstr "Kompassretning på segmentet som tegnes." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The length of the new way segment being drawn." msgstr "Lengden på segmentet som tegnes." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(intet objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301 msgid "layer not in list." msgstr "Laget er ikke i lista." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488 #, java-format msgid "Layer ''{0}'' must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:265 -#, java-format -msgid "" -"Warning: failed to put option pane dialog always on top. Exception was: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 -#, java-format -msgid "" -"Warning: failed to put ''please wait dialog'' always on top. Exception was: " -"{0}" msgstr "" @@ -3600,10 +3933,4 @@ msgid "File not found" msgstr "Fant ikke fila" - -#: ../core/src/org/openstreetmap/josm/gui/PrimitiveNameFormatter.java:13 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 -#, java-format -msgid " [id: {0}]" -msgstr " [id: {0}]" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -3663,7 +3990,6 @@ #: ../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/dialogs/relation/GenericRelationEditor.java:299 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" @@ -3679,5 +4005,5 @@ #: ../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:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3784,5 +4110,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Lokal versjon" @@ -3793,5 +4119,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 msgid "Merged version" @@ -3807,5 +4133,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Tjenerversjon" @@ -3896,6 +4222,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -4011,10 +4337,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182 #, java-format msgid "unexpected column index. Got {0}" msgstr "Uventet kolonneindeks: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 #, java-format msgid "" @@ -4025,19 +4351,19 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 msgid "Communication with server failed" msgstr "Kommunikasjon med tjener feilet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "Ja, gjenopprett også dem" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "Nei, avbryt operasjonen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 #, java-format msgid "" @@ -4048,5 +4374,5 @@ "

Vil du gjenopprette også disse nodene?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 msgid "Undelete additional nodes?" msgstr "Gjenopprette ytterligere noder?" @@ -4066,9 +4392,9 @@ msgstr "Gjenopprette avhengige objekter?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:79 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Egenskaper i det lokate datasettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 msgid "" "Properties in the merged element. They will replace properties in my " @@ -4078,95 +4404,97 @@ "elementer når sammenslåingsvalgene tas i bruk." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Egenskaper i tjenerens datasett" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:107 msgid "Coordinates:" msgstr "Koordinater:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 msgid "Deleted State:" msgstr "Slettestatus:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Visible State:" msgstr "Synlighetsstatus:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(ingen)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:50 msgid "deleted" msgstr "slettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 msgid "not deleted" msgstr "ikke slettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "visible (on the server)" msgstr "synlig (på tjeneren)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" msgstr "ikke synlig (på tjeneren)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Keep a clone of the local version" msgstr "Behold en klone av den lokale versjonen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "Slett fra det lokale datasettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 msgid "Keep my coordiates" msgstr "Behold lokale koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 msgid "Keep their coordiates" msgstr "Behold tjenerens koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 msgid "Undecide conflict between different coordinates" msgstr "Fjern avgjørelse fra koordinatkonflikt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 msgid "Keep my deleted state" msgstr "Behold lokal slettestatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 msgid "Keep their deleted state" msgstr "Behold tjenerens slettestatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 msgid "Undecide conflict between deleted state" msgstr "Fjern avgjørelse fra slettekonflikt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 msgid "Keep my visible state" msgstr "Behold lokal synlighetsstatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 msgid "Yes, reset the id" msgstr "Ja, nullstill ID" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 msgid "No, abort" msgstr "Nei, avbryt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of {0} {1} to " -"0.
On the next upload the server will assign
it a new id.
Do yo " -"agree?" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#, fuzzy, java-format +msgid "" +"To keep your local version, JOSM
has to reset the id of primitive " +"{0} to 0.
On the next upload the server will assign
it a new id.
Do " +"yo agree?" msgstr "" "For å beholde den lokale versjonen,
må JOSM sette ID for {0} {1} " @@ -4174,17 +4502,17 @@ "
Er dette OK?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 msgid "Reset id to 0" msgstr "Nullstill ID" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Keep their visible state" msgstr "Behold tjenerens synlighetsstatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Yes, purge it" msgstr "Ja, rydd ut objektet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 #, java-format msgid "" @@ -4195,21 +4523,21 @@ "OK?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 msgid "Remove from dataset" msgstr "Fjern fra datasett" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 msgid "Undecide conflict between visible state" msgstr "Fjern avgjørelse fra visningskonflikt" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 msgid "Role" msgstr "Rolle" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Objekt" @@ -4248,10 +4576,11 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4260,10 +4589,11 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 -#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4277,5 +4607,5 @@ #. should not happen, but just in case -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39 #, java-format msgid "Parameter 'col' must be 0 or 1. Got {0}" @@ -4316,4 +4646,141 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "Tjenerens datasett inneholder ingen egenskap med nøkkel {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 +msgid "none" +msgstr "ingen" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: build/trans_presets.java:2272 +msgid "all" +msgstr "alle" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Velg en farge" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:43 +msgid "Please decided which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:47 +#, fuzzy, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "parameter «{0}» er ikke et gyldig typenavn – leste «{1}»" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#, java-format +msgid "The key ''{0}'' and all it's values are going to be removed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:56 +#, java-format +msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 +#, fuzzy, java-format +msgid "parameter ''{0}'' must not be empty" +msgstr "parameter «{0}» må ha en verdi" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 +#, fuzzy, java-format +msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" +msgstr "parameter «{0}» i intervall 0–{1} forventet – leste {2}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 +msgid "tag collection doesn't include the selected value ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 +#, fuzzy +msgid "not yet decided" +msgstr "ikke slettet" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:289 +#, fuzzy +msgid "Not decided yet" +msgstr "Ikke implementert enda." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 +msgid "Tags from nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 +#, fuzzy +msgid "Tags from ways" +msgstr "fra linje" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Slett fra relasjon" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Konflikter i data" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 +#, java-format +msgid "{0} way" +msgid_plural "{0} ways" +msgstr[0] "{0} linje" +msgstr[1] "{0} linjer" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 +#, java-format +msgid "{0} relation" +msgid_plural "{0} relations" +msgstr[0] "{0} relasjon" +msgstr[1] "{0} relasjoner" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Konfliktløsning" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Løs konflikter" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 +#, fuzzy +msgid "Paste ..." +msgstr "Lim inn" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 +msgid "From ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 +msgid "To ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428 +#, fuzzy, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "{0} linje" +msgstr[1] "{0} linjer" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4329,10 +4796,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -4340,5 +4807,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #, java-format msgid "Toggle: {0}" @@ -4369,36 +4836,30 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "Sett valgte kartobjekt til det som er valgt i lista ovenfor." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 -msgid "" -"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " -"Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:162 msgid "Cancel conflict resolution and close the dialog" msgstr "Avbryt konfliktløsning og lukk vinduet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:180 msgid "Apply resolved conflicts and close the dialog" msgstr "Ta i bruk løste konflikter og lukk vinduet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:181 msgid "Apply Resolution" msgstr "Bruk løsninger" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 msgid "Close anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194 msgid "Continue resolving" msgstr "Fortsett å løse" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196 #, java-format msgid "" @@ -4410,151 +4871,118 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 msgid "Resolve conflicts" msgstr "Løs konflikter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:243 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 msgid "History" msgstr "Historikk" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 msgid "Display the history of all selected items." msgstr "Vis historikk på alle valgte objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" -"Klarte ikke laste historikk fra tjeneren. Detaljer:
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239 #, java-format msgid "index out of bounds Got {0}" msgstr "Indeks er utenfor rekkevidde: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#, java-format +msgid "Node {0}" +msgstr "Node {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +#, fuzzy, java-format +msgid "Way {0}" +msgstr "Lag: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#, fuzzy, java-format +msgid "Relation {0}" +msgstr "Relasjoner: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 msgid "History item" msgstr "Historikkobjekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 -msgid "Load history" -msgstr "Last historikk" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 -#, java-format -msgid "Loading history for {0} with id {1}" -msgstr "Laster historikk for {0} med ID {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317 msgid "Reload all currently selected objects and refresh the list." msgstr "Les inn og oppfrisk liste over alle valgte objekt." #. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341 msgid "Show" msgstr "Vis" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342 msgid "Display the history of the selected primitive" msgstr "Vis historikken for det valgte objektet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" -#: ../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:147 +#: ../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:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297 msgid "Delete the selected layer." msgstr "Slett valgt Lag." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304 -#, java-format -msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305 -msgid "Delete Layer" -msgstr "Slett Lag" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332 -#, java-format -msgid "Do you really want to delete layer ''{0}''?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132 -msgid "Confirmation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324 -msgid "Yes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325 -msgid "No" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326 -msgid "Delete all" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333 -#, java-format -msgid "Deleting layer {0} of {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367 msgid "Show/Hide" msgstr "Vis/Skjul" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378 msgid "Toggle visible state of the selected layer." msgstr "Slå av/på visning av Lag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581 msgid "Move the selected layer one row up." msgstr "Flytt laget en rad opp." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600 msgid "Move the selected layer one row down." msgstr "Flytt laget en rad ned." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33 msgid "Information about layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4563,28 +4991,22 @@ msgstr[1] "Dette vil endre opptil {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 msgid "An empty value deletes the key." msgstr "Nøkkelen blir ikke lagret når den er tom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:112 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Endre verdier?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#, java-format -msgid "" -"Warning: failed to put properties dialog always on top. Exception was: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4593,89 +5015,84 @@ msgstr[1] "Endre egenskap på inntil {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Velg en nøkkel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Velg en verdi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360 -#, java-format -msgid "Warning: failed to put dialog always on top. Exception was: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 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/PropertiesDialog.java:468 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Egenskaper/medlemsskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 msgid "Properties for selected objects." msgstr "Egenskaper for valgte objekt." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 msgid "Member Of" msgstr "Medlem av" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Tilføy egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:65 msgid "Add" msgstr "Legg til" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 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/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Endre Oppsett" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 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/PropertiesDialog.java:808 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Egenskaper: {0} / Medlemskap: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 msgid "Properties / Memberships" msgstr "Egenskaper / Medlemskap" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Skift relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Vil du slette utvalget fra relasjon {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 msgid "Delete the selected key in all objects" msgstr "Fjern den valgte nøkkel i alle objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "DSlett egenskaper" @@ -4684,34 +5101,34 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148 -#: build/trans_presets.java:2978 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146 +#: build/trans_presets.java:3106 msgid "Relations" msgstr "Relasjoner" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 msgid "Open a list of all relations." msgstr "Åpne en liste over alle relasjoner" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144 #, java-format msgid "Relations: {0}" msgstr "Relasjoner: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 msgid "Open an editor for the selected relation" msgstr "Åpne en editor for den valgte relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 msgid "Delete the selected relation" msgstr "Slet valgt relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336 msgid "Create a new relation" msgstr "Oprett ny relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -4744,23 +5161,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Utvalg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} linje" -msgstr[1] "{0} linjer" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} relasjon" -msgstr[1] "{0} relasjoner" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4768,78 +5171,107 @@ msgstr "Utvalg: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434 msgid "Undock the panel" msgstr "Frigjør panelet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 -#, java-format -msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447 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:227 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457 msgid "Click to minimize/maximize the panel content" msgstr "Klikk for at minimere/maksimere panelet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 msgid "Authors" msgstr "Opphavsmenn" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 msgid "Open a list of people working on the selected objects." msgstr "Åbn en liste af brugere som jobber på de valgte objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 +#, fuzzy, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "Opphavsmann" +msgstr[1] "Opphavsmann" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 +#, fuzzy +msgid "Show info" +msgstr "Vis" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 +#, fuzzy +msgid "Launches a browser with information about the user" +msgstr "Mer informasjon om denne funksjonen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 +#, fuzzy, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" +"ADVARSEL: Starter leservindu kun for de første {0} av {1} valgte objektene" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "Author" msgstr "Opphavsmann" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "# objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Opphavsmenn: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435 msgid "Edit the relation the currently selected relation member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +#: ../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:224 +#: ../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:243 +#: ../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:247 +#: ../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:292 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502 msgid "Download relation members" msgstr "Last ned medlemer av relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 msgid "Conflicts in data" msgstr "Konflikter i data" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:343 #, java-format msgid "" @@ -4848,47 +5280,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:352 msgid "Relation is deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 #, java-format msgid "Downloading relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 -#, java-format -msgid "" -"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" -msgstr "" - #. --- role editing -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581 msgid "Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 msgid "" "There is at least one member in this relation referring
to the " @@ -4897,14 +5323,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680 #, java-format msgid "" @@ -4914,9 +5340,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 #, java-format msgid "" @@ -4926,15 +5352,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -4942,5 +5368,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -4948,20 +5374,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869 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:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 #, java-format msgid "" @@ -4970,57 +5396,57 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 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:1011 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995 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:1030 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5029,9 +5455,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143 #, java-format msgid "" @@ -5040,20 +5466,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 msgid "Apply the current updates" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190 -msgid "Apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -5063,37 +5485,37 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 msgid "Delete the currently selected tags" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 msgid "Download all incomplete ways and nodes in relation" msgstr "Last ned alle ufullstendige linjer og noder i relasjonen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 msgid "Download Members" msgstr "Last ned medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356 #, java-format msgid "" @@ -5103,30 +5525,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 msgid "Zoom to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223 msgid "Zoom to primitive the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -5140,22 +5562,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 msgid "Download referring relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81 #, java-format msgid "child.id >0 expected. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63 msgid "including immediate children of parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 msgid "Load parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#, fuzzy +msgid "Loading parent relations" +msgstr "Rediger relasjoner" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "" @@ -5188,34 +5615,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 -#, java-format -msgid "Remove old keys from up to {0} object" -msgid_plural "Remove old keys from up to {0} objects" -msgstr[0] "Fjern gamle egenskapsnøkler fra {0} objekt" -msgstr[1] "Fjern gamle egenskapsnøkler fra {0} objekt" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Bokmerker" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82 msgid "Please enter the desired coordinates first." msgstr "Tast inn først de ønskede koordinater." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89 msgid "Please enter a name for the location." msgstr "Tast inn et navn for stedet." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107 msgid "Select a bookmark first." msgstr "Velg først et bokmerke" @@ -5272,13 +5686,13 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118 msgid "Null pointer exception, possibly some missing tags." msgstr "Null pointer-feil, muligens manglende egenskaper." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 msgid "Please enter a search string" msgstr "Skriv inn en søkestreng" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192 msgid "Cannot read place search results from server" msgstr "Klarte ikke lese søkeresultat om sted fra tjener" @@ -5286,18 +5700,17 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214 msgid "Enter a place name to search for:" msgstr "Gi et stednavn å søke etter:" -#. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 -#: build/trans_presets.java:2623 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 +#: build/trans_presets.java:2744 msgid "Places" msgstr "Steder" #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 msgid "name" msgstr "navn" @@ -5336,37 +5749,37 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 -#: build/trans_presets.java:1856 build/trans_presets.java:1862 -#: build/trans_presets.java:1868 build/trans_presets.java:1874 -#: build/trans_presets.java:1880 build/trans_presets.java:1886 -#: build/trans_presets.java:1892 build/trans_presets.java:1898 -#: build/trans_presets.java:1904 build/trans_presets.java:1910 -#: build/trans_presets.java:1916 build/trans_presets.java:1922 -#: build/trans_presets.java:1928 build/trans_presets.java:1934 -#: build/trans_presets.java:1940 build/trans_presets.java:1949 -#: build/trans_presets.java:1956 build/trans_presets.java:1964 -#: build/trans_presets.java:1970 build/trans_presets.java:1976 -#: build/trans_presets.java:1982 build/trans_presets.java:1988 -#: build/trans_presets.java:1994 build/trans_presets.java:2000 -#: build/trans_presets.java:2006 build/trans_presets.java:2012 -#: build/trans_presets.java:2018 build/trans_presets.java:2024 -#: build/trans_presets.java:2030 build/trans_presets.java:2036 -#: build/trans_presets.java:2042 build/trans_presets.java:2048 -#: build/trans_presets.java:2054 build/trans_presets.java:2060 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250 +#: build/trans_presets.java:1923 build/trans_presets.java:1929 +#: build/trans_presets.java:1935 build/trans_presets.java:1941 +#: build/trans_presets.java:1947 build/trans_presets.java:1953 +#: build/trans_presets.java:1959 build/trans_presets.java:1965 +#: build/trans_presets.java:1971 build/trans_presets.java:1977 +#: build/trans_presets.java:1983 build/trans_presets.java:1989 +#: build/trans_presets.java:1995 build/trans_presets.java:2001 +#: build/trans_presets.java:2007 build/trans_presets.java:2016 +#: build/trans_presets.java:2023 build/trans_presets.java:2031 +#: build/trans_presets.java:2037 build/trans_presets.java:2043 +#: build/trans_presets.java:2049 build/trans_presets.java:2055 +#: build/trans_presets.java:2061 build/trans_presets.java:2067 +#: build/trans_presets.java:2073 build/trans_presets.java:2079 +#: build/trans_presets.java:2085 build/trans_presets.java:2091 +#: build/trans_presets.java:2097 build/trans_presets.java:2103 +#: build/trans_presets.java:2109 build/trans_presets.java:2115 +#: build/trans_presets.java:2121 build/trans_presets.java:2127 msgid "type" msgstr "type" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251 msgid "near" msgstr "nær" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "zoom" msgstr "zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -5375,5 +5788,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 msgid "Slippy map" msgstr "Flytbart kart" @@ -5400,30 +5813,39 @@ msgstr "Flis-nummer" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 -#, java-format -msgid "History for {0} {1}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44 +#, fuzzy, java-format +msgid "History for node {0}" msgstr "Historikk for {0} {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 -#, java-format -msgid "" -"Warning: failed to put history browser always on top. Exception was: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 +#, fuzzy, java-format +msgid "History for way {0}" +msgstr "Historikk for {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, fuzzy, java-format +msgid "History for relation {0}" +msgstr "Historikk for {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 msgid "Close the dialog" msgstr "Lukk vinduet" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 +#, fuzzy +msgid "Reload the history from the server" +msgstr "Vis historikken for det valgte objektet" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 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:181 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:182 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201 #, java-format msgid "failed to set reference. reference id {0} doesn't match history id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185 #, java-format msgid "failed to set reference. reference version {0} not available in history" @@ -5432,9 +5854,9 @@ "historikken." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199 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:203 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204 #, java-format msgid "failed to set current. current version {0} not available in history" @@ -5443,8 +5865,27 @@ "tilgjengelig i historikken." -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#, java-format -msgid "Node {0}" -msgstr "Node {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "Last historikk" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, fuzzy, java-format +msgid "id > 0 expected, got {0}" +msgstr "parameter «{0}» > 0 forventet – leste «{1}»" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, fuzzy, java-format +msgid "Loading history for node {0}" +msgstr "Laster historikk for {0} med ID {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, fuzzy, java-format +msgid "Loading history for way {0}" +msgstr "Laster historikk for {0} med ID {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, fuzzy, java-format +msgid "Loading history for relation {0}" +msgstr "Laster historikk for {0} med ID {1}" #. item "Streets/Motorway" text "Reference" @@ -5762,14 +6203,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -5945,8 +6400,14 @@ #. item "Shops/Supermarket" label "Edit Supermarket" #. +#. item "Shops/Chemist" label "Edit Chemist" +#. #. item "Shops/Convenience Store" label "Edit Convenience Store" #. #. item "Shops/Kiosk" label "Edit Kiosk" #. +#. item "Shops/Book Store" label "Edit Book Store" +#. +#. item "Shops/Travel Agency" label "Edit Travel Agency" +#. #. item "Shops/Butcher" label "Edit Butcher" #. @@ -6043,4 +6504,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6154,6 +6618,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 #: build/trans_presets.java:66 build/trans_presets.java:102 #: build/trans_presets.java:142 build/trans_presets.java:179 @@ -6161,156 +6625,174 @@ #: build/trans_presets.java:234 build/trans_presets.java:252 #: build/trans_presets.java:272 build/trans_presets.java:305 -#: build/trans_presets.java:350 build/trans_presets.java:370 -#: build/trans_presets.java:385 build/trans_presets.java:402 -#: build/trans_presets.java:422 build/trans_presets.java:442 -#: build/trans_presets.java:461 build/trans_presets.java:479 -#: build/trans_presets.java:499 build/trans_presets.java:519 -#: 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:653 -#: build/trans_presets.java:674 build/trans_presets.java:687 -#: build/trans_presets.java:700 build/trans_presets.java:713 -#: build/trans_presets.java:726 build/trans_presets.java:739 -#: build/trans_presets.java:750 build/trans_presets.java:759 -#: build/trans_presets.java:806 build/trans_presets.java:827 -#: build/trans_presets.java:836 build/trans_presets.java:896 -#: build/trans_presets.java:1046 build/trans_presets.java:1054 -#: build/trans_presets.java:1062 build/trans_presets.java:1070 -#: build/trans_presets.java:1080 build/trans_presets.java:1088 -#: build/trans_presets.java:1093 build/trans_presets.java:1100 -#: build/trans_presets.java:1107 build/trans_presets.java:1112 -#: build/trans_presets.java:1120 build/trans_presets.java:1129 -#: build/trans_presets.java:1135 build/trans_presets.java:1141 -#: build/trans_presets.java:1146 build/trans_presets.java:1152 -#: build/trans_presets.java:1158 build/trans_presets.java:1167 -#: build/trans_presets.java:1176 build/trans_presets.java:1183 -#: build/trans_presets.java:1191 build/trans_presets.java:1204 -#: build/trans_presets.java:1210 build/trans_presets.java:1219 -#: build/trans_presets.java:1225 build/trans_presets.java:1231 -#: build/trans_presets.java:1239 build/trans_presets.java:1294 -#: build/trans_presets.java:1341 build/trans_presets.java:1347 -#: build/trans_presets.java:1353 build/trans_presets.java:1359 -#: build/trans_presets.java:1365 build/trans_presets.java:1376 -#: build/trans_presets.java:1384 build/trans_presets.java:1393 -#: build/trans_presets.java:1400 build/trans_presets.java:1406 -#: build/trans_presets.java:1414 build/trans_presets.java:1421 -#: build/trans_presets.java:1430 build/trans_presets.java:1438 -#: build/trans_presets.java:1445 build/trans_presets.java:1456 -#: build/trans_presets.java:1466 build/trans_presets.java:1476 -#: build/trans_presets.java:1496 build/trans_presets.java:1508 -#: build/trans_presets.java:1519 build/trans_presets.java:1536 -#: build/trans_presets.java:1543 build/trans_presets.java:1558 -#: build/trans_presets.java:1565 build/trans_presets.java:1570 -#: build/trans_presets.java:1576 build/trans_presets.java:1582 -#: build/trans_presets.java:1587 build/trans_presets.java:1593 -#: build/trans_presets.java:1599 build/trans_presets.java:1607 -#: build/trans_presets.java:1614 build/trans_presets.java:1621 -#: build/trans_presets.java:1627 build/trans_presets.java:1632 -#: build/trans_presets.java:1638 build/trans_presets.java:1644 -#: build/trans_presets.java:1651 build/trans_presets.java:1658 -#: build/trans_presets.java:1665 build/trans_presets.java:1671 -#: build/trans_presets.java:1677 build/trans_presets.java:1683 -#: build/trans_presets.java:1691 build/trans_presets.java:1697 -#: build/trans_presets.java:1704 build/trans_presets.java:1712 -#: build/trans_presets.java:1718 build/trans_presets.java:1725 -#: build/trans_presets.java:1731 build/trans_presets.java:1741 -#: build/trans_presets.java:1746 build/trans_presets.java:1753 -#: build/trans_presets.java:1759 build/trans_presets.java:1765 -#: build/trans_presets.java:1771 build/trans_presets.java:1776 +#: build/trans_presets.java:351 build/trans_presets.java:371 +#: build/trans_presets.java:386 build/trans_presets.java:403 +#: build/trans_presets.java:423 build/trans_presets.java:443 +#: build/trans_presets.java:463 build/trans_presets.java:482 +#: build/trans_presets.java:502 build/trans_presets.java:522 +#: 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:658 +#: build/trans_presets.java:679 build/trans_presets.java:692 +#: build/trans_presets.java:705 build/trans_presets.java:718 +#: build/trans_presets.java:731 build/trans_presets.java:744 +#: build/trans_presets.java:755 build/trans_presets.java:764 +#: build/trans_presets.java:811 build/trans_presets.java:832 +#: build/trans_presets.java:841 build/trans_presets.java:901 +#: build/trans_presets.java:1051 build/trans_presets.java:1059 +#: build/trans_presets.java:1067 build/trans_presets.java:1075 +#: build/trans_presets.java:1085 build/trans_presets.java:1093 +#: build/trans_presets.java:1098 build/trans_presets.java:1105 +#: build/trans_presets.java:1112 build/trans_presets.java:1117 +#: build/trans_presets.java:1125 build/trans_presets.java:1134 +#: build/trans_presets.java:1140 build/trans_presets.java:1146 +#: build/trans_presets.java:1151 build/trans_presets.java:1157 +#: build/trans_presets.java:1163 build/trans_presets.java:1172 +#: build/trans_presets.java:1181 build/trans_presets.java:1188 +#: build/trans_presets.java:1196 build/trans_presets.java:1209 +#: build/trans_presets.java:1215 build/trans_presets.java:1224 +#: build/trans_presets.java:1230 build/trans_presets.java:1236 +#: build/trans_presets.java:1244 build/trans_presets.java:1299 +#: build/trans_presets.java:1346 build/trans_presets.java:1352 +#: build/trans_presets.java:1358 build/trans_presets.java:1364 +#: build/trans_presets.java:1370 build/trans_presets.java:1381 +#: build/trans_presets.java:1390 build/trans_presets.java:1405 +#: build/trans_presets.java:1412 build/trans_presets.java:1418 +#: build/trans_presets.java:1426 build/trans_presets.java:1433 +#: build/trans_presets.java:1442 build/trans_presets.java:1450 +#: 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:1548 +#: build/trans_presets.java:1555 build/trans_presets.java:1570 +#: build/trans_presets.java:1577 build/trans_presets.java:1582 +#: build/trans_presets.java:1588 build/trans_presets.java:1594 +#: build/trans_presets.java:1599 build/trans_presets.java:1605 +#: build/trans_presets.java:1611 build/trans_presets.java:1619 +#: build/trans_presets.java:1627 build/trans_presets.java:1635 +#: build/trans_presets.java:1642 build/trans_presets.java:1648 +#: build/trans_presets.java:1655 build/trans_presets.java:1662 +#: build/trans_presets.java:1670 build/trans_presets.java:1677 +#: build/trans_presets.java:1685 build/trans_presets.java:1692 +#: build/trans_presets.java:1698 build/trans_presets.java:1705 +#: build/trans_presets.java:1712 build/trans_presets.java:1719 +#: build/trans_presets.java:1736 build/trans_presets.java:1744 +#: build/trans_presets.java:1759 build/trans_presets.java:1769 #: build/trans_presets.java:1781 build/trans_presets.java:1788 -#: build/trans_presets.java:1794 build/trans_presets.java:1799 -#: build/trans_presets.java:1807 build/trans_presets.java:1816 -#: build/trans_presets.java:1825 build/trans_presets.java:1834 -#: build/trans_presets.java:1843 build/trans_presets.java:1848 -#: build/trans_presets.java:1855 build/trans_presets.java:1861 -#: build/trans_presets.java:1867 build/trans_presets.java:1873 -#: build/trans_presets.java:1879 build/trans_presets.java:1885 -#: build/trans_presets.java:1891 build/trans_presets.java:1897 -#: build/trans_presets.java:1903 build/trans_presets.java:1909 -#: build/trans_presets.java:1915 build/trans_presets.java:1921 -#: build/trans_presets.java:1927 build/trans_presets.java:1933 -#: build/trans_presets.java:1939 build/trans_presets.java:1946 -#: build/trans_presets.java:1955 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:2029 build/trans_presets.java:2035 -#: build/trans_presets.java:2041 build/trans_presets.java:2047 -#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:1794 build/trans_presets.java:1804 +#: build/trans_presets.java:1809 build/trans_presets.java:1817 +#: build/trans_presets.java:1824 build/trans_presets.java:1830 +#: build/trans_presets.java:1836 build/trans_presets.java:1841 +#: build/trans_presets.java:1846 build/trans_presets.java:1853 +#: build/trans_presets.java:1859 build/trans_presets.java:1864 +#: build/trans_presets.java:1872 build/trans_presets.java:1881 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1914 +#: build/trans_presets.java:1922 build/trans_presets.java:1928 +#: build/trans_presets.java:1934 build/trans_presets.java:1940 +#: build/trans_presets.java:1946 build/trans_presets.java:1952 +#: build/trans_presets.java:1958 build/trans_presets.java:1964 +#: build/trans_presets.java:1970 build/trans_presets.java:1976 +#: build/trans_presets.java:1982 build/trans_presets.java:1988 +#: build/trans_presets.java:1994 build/trans_presets.java:2000 +#: build/trans_presets.java:2006 build/trans_presets.java:2013 +#: build/trans_presets.java:2022 build/trans_presets.java:2030 +#: build/trans_presets.java:2036 build/trans_presets.java:2042 +#: build/trans_presets.java:2048 build/trans_presets.java:2054 +#: build/trans_presets.java:2060 build/trans_presets.java:2066 #: build/trans_presets.java:2072 build/trans_presets.java:2078 -#: build/trans_presets.java:2084 build/trans_presets.java:2091 -#: build/trans_presets.java:2098 build/trans_presets.java:2106 -#: 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:2084 build/trans_presets.java:2090 +#: build/trans_presets.java:2096 build/trans_presets.java:2102 +#: build/trans_presets.java:2108 build/trans_presets.java:2114 +#: build/trans_presets.java:2120 build/trans_presets.java:2126 +#: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2158 -#: build/trans_presets.java:2164 build/trans_presets.java:2171 -#: build/trans_presets.java:2179 build/trans_presets.java:2210 -#: build/trans_presets.java:2215 build/trans_presets.java:2220 -#: build/trans_presets.java:2225 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2251 build/trans_presets.java:2257 -#: build/trans_presets.java:2263 build/trans_presets.java:2269 -#: build/trans_presets.java:2275 build/trans_presets.java:2285 -#: build/trans_presets.java:2378 build/trans_presets.java:2385 -#: build/trans_presets.java:2399 build/trans_presets.java:2405 -#: build/trans_presets.java:2411 build/trans_presets.java:2432 -#: build/trans_presets.java:2438 build/trans_presets.java:2444 -#: build/trans_presets.java:2449 build/trans_presets.java:2455 -#: build/trans_presets.java:2460 build/trans_presets.java:2465 -#: build/trans_presets.java:2470 build/trans_presets.java:2475 -#: build/trans_presets.java:2480 build/trans_presets.java:2486 -#: build/trans_presets.java:2492 build/trans_presets.java:2498 -#: build/trans_presets.java:2503 build/trans_presets.java:2508 -#: build/trans_presets.java:2513 build/trans_presets.java:2518 -#: build/trans_presets.java:2523 build/trans_presets.java:2529 -#: build/trans_presets.java:2535 build/trans_presets.java:2541 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2560 build/trans_presets.java:2567 -#: build/trans_presets.java:2581 build/trans_presets.java:2586 -#: build/trans_presets.java:2593 build/trans_presets.java:2599 -#: build/trans_presets.java:2619 build/trans_presets.java:2628 -#: build/trans_presets.java:2634 build/trans_presets.java:2640 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2673 build/trans_presets.java:2679 -#: build/trans_presets.java:2685 build/trans_presets.java:2693 -#: build/trans_presets.java:2700 build/trans_presets.java:2707 -#: build/trans_presets.java:2713 build/trans_presets.java:2720 -#: build/trans_presets.java:2727 build/trans_presets.java:2736 -#: build/trans_presets.java:2742 build/trans_presets.java:2748 -#: build/trans_presets.java:2754 build/trans_presets.java:2760 -#: build/trans_presets.java:2769 build/trans_presets.java:2779 -#: build/trans_presets.java:2788 build/trans_presets.java:2794 -#: build/trans_presets.java:2800 build/trans_presets.java:2805 -#: build/trans_presets.java:2811 build/trans_presets.java:2817 -#: build/trans_presets.java:2826 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2862 build/trans_presets.java:2869 -#: build/trans_presets.java:2875 build/trans_presets.java:2880 -#: build/trans_presets.java:2887 build/trans_presets.java:2894 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2917 build/trans_presets.java:2923 -#: build/trans_presets.java:2929 build/trans_presets.java:2936 -#: build/trans_presets.java:2942 build/trans_presets.java:2949 -#: build/trans_presets.java:2955 build/trans_presets.java:2961 -#: build/trans_presets.java:2967 build/trans_presets.java:2973 -#: build/trans_presets.java:2986 build/trans_presets.java:3000 -#: build/trans_presets.java:3014 +#: build/trans_presets.java:2165 build/trans_presets.java:2173 +#: build/trans_presets.java:2180 build/trans_presets.java:2186 +#: build/trans_presets.java:2192 build/trans_presets.java:2198 +#: build/trans_presets.java:2204 build/trans_presets.java:2210 +#: build/trans_presets.java:2218 build/trans_presets.java:2225 +#: build/trans_presets.java:2232 build/trans_presets.java:2239 +#: build/trans_presets.java:2247 build/trans_presets.java:2279 +#: build/trans_presets.java:2284 build/trans_presets.java:2289 +#: build/trans_presets.java:2294 build/trans_presets.java:2300 +#: build/trans_presets.java:2306 build/trans_presets.java:2312 +#: build/trans_presets.java:2320 build/trans_presets.java:2326 +#: build/trans_presets.java:2332 build/trans_presets.java:2338 +#: build/trans_presets.java:2344 build/trans_presets.java:2354 +#: build/trans_presets.java:2448 build/trans_presets.java:2455 +#: build/trans_presets.java:2469 build/trans_presets.java:2475 +#: build/trans_presets.java:2482 build/trans_presets.java:2489 +#: build/trans_presets.java:2495 build/trans_presets.java:2501 +#: build/trans_presets.java:2523 build/trans_presets.java:2530 +#: build/trans_presets.java:2537 build/trans_presets.java:2543 +#: build/trans_presets.java:2550 build/trans_presets.java:2556 +#: build/trans_presets.java:2562 build/trans_presets.java:2568 +#: build/trans_presets.java:2574 build/trans_presets.java:2580 +#: build/trans_presets.java:2587 build/trans_presets.java:2594 +#: build/trans_presets.java:2601 build/trans_presets.java:2607 +#: build/trans_presets.java:2613 build/trans_presets.java:2619 +#: build/trans_presets.java:2625 build/trans_presets.java:2631 +#: build/trans_presets.java:2638 build/trans_presets.java:2645 +#: build/trans_presets.java:2652 build/trans_presets.java:2658 +#: build/trans_presets.java:2664 build/trans_presets.java:2674 +#: build/trans_presets.java:2683 build/trans_presets.java:2698 +#: build/trans_presets.java:2704 build/trans_presets.java:2712 +#: build/trans_presets.java:2719 build/trans_presets.java:2739 +#: build/trans_presets.java:2749 build/trans_presets.java:2755 +#: build/trans_presets.java:2761 build/trans_presets.java:2767 +#: build/trans_presets.java:2773 build/trans_presets.java:2780 +#: build/trans_presets.java:2787 build/trans_presets.java:2794 +#: build/trans_presets.java:2800 build/trans_presets.java:2806 +#: build/trans_presets.java:2814 build/trans_presets.java:2821 +#: build/trans_presets.java:2828 build/trans_presets.java:2835 +#: build/trans_presets.java:2841 build/trans_presets.java:2848 +#: 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:2897 build/trans_presets.java:2907 +#: build/trans_presets.java:2916 build/trans_presets.java:2922 +#: build/trans_presets.java:2928 build/trans_presets.java:2933 +#: build/trans_presets.java:2939 build/trans_presets.java:2945 +#: build/trans_presets.java:2954 build/trans_presets.java:2960 +#: build/trans_presets.java:2966 build/trans_presets.java:2972 +#: build/trans_presets.java:2978 build/trans_presets.java:2984 +#: build/trans_presets.java:2990 build/trans_presets.java:2997 +#: build/trans_presets.java:3003 build/trans_presets.java:3008 +#: build/trans_presets.java:3015 build/trans_presets.java:3022 +#: build/trans_presets.java:3028 build/trans_presets.java:3037 +#: build/trans_presets.java:3045 build/trans_presets.java:3051 +#: build/trans_presets.java:3057 build/trans_presets.java:3064 +#: build/trans_presets.java:3070 build/trans_presets.java:3077 +#: build/trans_presets.java:3083 build/trans_presets.java:3089 +#: build/trans_presets.java:3095 build/trans_presets.java:3101 +#: build/trans_presets.java:3114 build/trans_presets.java:3128 +#: build/trans_presets.java:3142 msgid "Name" msgstr "Navn" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45 -#, java-format +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 +#, fuzzy, java-format msgid "" "Version {0} created on {1} by " -"{2}" +"{2} in changeset {3}" msgstr "" "Versjon {0} lagt til {1} av " "{2}" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "endringssett" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Mer informasjon om denne funksjonen" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Siste endring på {0}" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 #, java-format @@ -6318,32 +6800,287 @@ msgstr "Versjon {0} lagt til {1} av {2}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" msgstr "Versjon" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 +msgid "Launch a file chooser to select a file" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#, fuzzy +msgid "Select filename" +msgstr "Gatenavn" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "Yes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "No" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#, java-format +msgid "Layer ''{0}'' has modifications which should be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#, java-format +msgid "Layer ''{0}'' has no modifications to be uploaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#, java-format +msgid "" +"Layer ''{0}'' has modifications which should be saved to its assoicated file " +"''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#, java-format +msgid "Layer ''{0}'' has no modifications to be saved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +msgid "No file associated with this layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#, fuzzy +msgid "Please select a file" +msgstr "Velg en verdi" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "parameter «{0}» må ha en verdi" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#, java-format +msgid "File ''{0}'' is not writable. Please enter another file name." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#, java-format +msgid "Select to upload layer ''{0}'' to the server ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49 +#, java-format +msgid "Saving layer to ''{0}'' ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 +msgid "Unsaved changes - Save/Upload before exiting?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 +msgid "Unsaved changes - Save/Upload before deleting?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 +msgid "Uploading and saving modified layers ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 +#, java-format +msgid "" +"{0} layer has unresolved conflicts.
Either resolve them first or " +"discard the modifications.
Layer with conflicts:" +msgid_plural "" +"{0} layers have unresolved conflicts.
Either resolve them first or " +"discard the modifications.
Layers with conflicts:" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +#, fuzzy +msgid "Unsafed data and conflicts" +msgstr "Reparer konflikter i egenskaper." + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 +#, java-format +msgid "" +"{0} layer needs saving but has no associated file.
Either select a " +"file for this layer or discard the changes.
Layer without a file:" +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:" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 +msgid "Unsafed data and missing associated file" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 +#, 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:" +msgid_plural "" +"{0} layers need saving but have associated files
which can't be " +"written.
Either select another file for each of them or discard the " +"changes.
Layers with non-writable files:" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 +msgid "Unsafed data non-writable files" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 +msgid "Close this dialog and resume editing in JOSM" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 +msgid "Exit JOSM without saving. Unsaved changes are lost." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#, fuzzy +msgid "Discard and Delete" +msgstr "Forkast og avslutt" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 +msgid "Delete layers without saving. Unsaved changes are lost." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 +msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#, fuzzy +msgid "Save and Delete" +msgstr "Lagre og avslutt" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 +msgid "Save/Upload layers before deleting. Unsaved changes are not lost." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 +#, java-format +msgid "Preparing layer ''{0}'' for upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +msgid "" +"An upload and/or save operation of one layer with modifications
was " +"cancelled or has been failed." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +msgid "Incomplete upload and/or save" +msgstr "" + +#. item "Streets/Motorway" text "Name" +#. item "Streets/Motorway Link" label "Edit Motorway Link" +#. +#. +#. +#. item "Streets/Trunk" text "Name" +#. item "Streets/Trunk Link" text "Reference" +#. +#. item "Streets/Primary" text "Name" +#. item "Streets/Primary Link" label "Edit Primary Link" +#. +#. +#. +#. item "Streets/Secondary" text "Name" +#. item "Streets/Tertiary" text "Name" +#. item "Streets/Unclassified" check "Embankment" +#. item "Streets/Residential" check "Embankment" +#. item "Streets/Living Street" check "Embankment" +#. item "Streets/Service" check "Embankment" +#. item "Streets/Road (Unknown Type)" check "Embankment" +#. item "Streets/Roundabout" check "Embankment" +#. item "Streets/Bridge" text "Name" +#. item "Streets/Tunnel" text "Name" +#. item "Ways/Construction" check "Embankment" +#. item "Ways/Bridleway" check "Embankment" +#. item "Ways/Pedestrian" check "Embankment" +#. item "Ways/Steps" check "Embankment" +#. item "Ways/Path" check "Embankment" +#. item "Water/Drain" text "Name" +#. item "Water/Stream" text "Name" +#. item "Water/Canal" text "Name" +#. item "Water/River" text "Name" +#. item "Railway/Bus Guideway" check "Embankment" +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: build/trans_presets.java:67 build/trans_presets.java:84 +#: build/trans_presets.java:103 build/trans_presets.java:122 +#: build/trans_presets.java:143 build/trans_presets.java:159 +#: build/trans_presets.java:180 build/trans_presets.java:200 +#: build/trans_presets.java:223 build/trans_presets.java:241 +#: build/trans_presets.java:259 build/trans_presets.java:278 +#: build/trans_presets.java:311 build/trans_presets.java:357 +#: build/trans_presets.java:372 build/trans_presets.java:387 +#: build/trans_presets.java:409 build/trans_presets.java:429 +#: build/trans_presets.java:450 build/trans_presets.java:470 +#: build/trans_presets.java:489 build/trans_presets.java:508 +#: build/trans_presets.java:528 build/trans_presets.java:549 +#: build/trans_presets.java:570 build/trans_presets.java:591 +#: build/trans_presets.java:612 build/trans_presets.java:633 +#: build/trans_presets.java:664 build/trans_presets.java:1060 +#: build/trans_presets.java:1068 build/trans_presets.java:1076 +#: build/trans_presets.java:1086 build/trans_presets.java:1305 +msgid "Layer" +msgstr "Lag" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#, fuzzy +msgid "Should upload?" +msgstr "Ved opplasting" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +msgid "Should save?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#, fuzzy +msgid "Filename" +msgstr "Fil" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Laster opp" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#, fuzzy +msgid "Preparing primitives to upload ..." +msgstr "Det er ingen valgte objekter å oppdatere" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Bilder for {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 msgid "Read GPX..." msgstr "Les GPX …" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 #, java-format msgid "No time for point {0} x {1}" msgstr "Ingen tid gitt for punkt {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Klarte ikke lese tid «{0}» for punkt {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 msgid "No images with readable timestamps found." msgstr "Ingen bilder med lesbare tidsstempler funnet" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -6351,29 +7088,29 @@ msgstr "Leser {0} …" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "Geotaggede bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 #, java-format msgid "GPS start: {0}" msgstr "GPS start: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS end: {0}" msgstr "GPS-slutt: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 #, java-format msgid "current delta: {0}s" msgstr "nåværende forskjell: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "tidssone-forskjell: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -6382,14 +7119,14 @@ msgstr[1] "bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 #, java-format msgid "{0} within the track." msgstr "{0} innenfor sporet." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Synkronisér klokke" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -6397,82 +7134,82 @@ msgstr "JPEG-bilder (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Klarte ikke tolke datoen i fila «{0}»." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Det er ikke noe EXIF-tidspunkt i fila «{0}»." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Bilde" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Gi den viste dato (mm/dd/åååå TT:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 msgid "GPS unit timezone (difference to photo)" msgstr "GPS-enhetens tidssone (forskjell fra foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 msgid "Synchronize Time with GPS Unit" msgstr "Synkronisér tidspunkt med GPS-enhet" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 msgid "Time entered could not be parsed." msgstr "Den indtastede tid kunne ikke tolkes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 msgid "gps point" msgstr "gps-punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196 msgid "Customize line drawing" msgstr "Tilpass linjetegning" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200 +msgid "Use global settings." +msgstr "Bruk globale indstillinger." + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201 -msgid "Use global settings." -msgstr "Bruk globale indstillinger." +msgid "Draw lines between points for this layer." +msgstr "Tegn linjer mellem punkter i dette laget." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 -msgid "Draw lines between points for this layer." -msgstr "Tegn linjer mellem punkter i dette laget." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Do not draw lines between points for this layer." msgstr "Tegn ikke linjer mellem punkt i dette laget." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "Select line drawing options" msgstr "Velg linjetegnings-innstillinger" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Tilpass farge" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Standard" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" @@ -6532,5 +7269,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Description: {0}" @@ -6546,10 +7283,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59 msgid "Convert to data layer" msgstr "Konverter til datalag" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -6560,11 +7297,11 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 @@ -6606,4 +7343,9 @@ "Ønsker du
å fortsette?" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Laster ned data" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6626,64 +7368,64 @@ "utelatt." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 #, java-format msgid "Data Layer {0}" msgstr "Datalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 msgid "outside downloaded area" msgstr "utenfor nedlastet område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #, java-format msgid "version {0}" msgstr "versjon {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Advarsel: blandede 0.6- og 0.5-data resulterer i versjon 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 #, java-format msgid "{0} consists of:" msgstr "{0} består av:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 #, java-format msgid " ({0} deleted.)" msgstr " ({0} slettet.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 msgid "unset" msgstr "ikke satt" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 #, java-format msgid "API version: {0}" msgstr "API versjon: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Konvertér til GPX-lag" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159 -#: build/trans_presets.java:1856 build/trans_presets.java:1862 -#: build/trans_presets.java:1868 build/trans_presets.java:1874 -#: build/trans_presets.java:1880 build/trans_presets.java:1886 -#: build/trans_presets.java:1892 build/trans_presets.java:1898 -#: build/trans_presets.java:1904 build/trans_presets.java:1910 -#: build/trans_presets.java:1916 build/trans_presets.java:1922 -#: build/trans_presets.java:1928 build/trans_presets.java:1934 -#: build/trans_presets.java:1940 build/trans_presets.java:1949 -#: build/trans_presets.java:1956 build/trans_presets.java:1964 -#: build/trans_presets.java:1970 build/trans_presets.java:1976 -#: build/trans_presets.java:1982 build/trans_presets.java:1988 -#: build/trans_presets.java:1994 build/trans_presets.java:2000 -#: build/trans_presets.java:2006 build/trans_presets.java:2012 -#: build/trans_presets.java:2018 build/trans_presets.java:2024 -#: build/trans_presets.java:2030 build/trans_presets.java:2036 -#: build/trans_presets.java:2042 build/trans_presets.java:2048 -#: build/trans_presets.java:2054 build/trans_presets.java:2060 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 +#: build/trans_presets.java:1923 build/trans_presets.java:1929 +#: build/trans_presets.java:1935 build/trans_presets.java:1941 +#: build/trans_presets.java:1947 build/trans_presets.java:1953 +#: build/trans_presets.java:1959 build/trans_presets.java:1965 +#: build/trans_presets.java:1971 build/trans_presets.java:1977 +#: build/trans_presets.java:1983 build/trans_presets.java:1989 +#: build/trans_presets.java:1995 build/trans_presets.java:2001 +#: build/trans_presets.java:2007 build/trans_presets.java:2016 +#: build/trans_presets.java:2023 build/trans_presets.java:2031 +#: build/trans_presets.java:2037 build/trans_presets.java:2043 +#: build/trans_presets.java:2049 build/trans_presets.java:2055 +#: build/trans_presets.java:2061 build/trans_presets.java:2067 +#: build/trans_presets.java:2073 build/trans_presets.java:2079 +#: build/trans_presets.java:2085 build/trans_presets.java:2091 +#: build/trans_presets.java:2097 build/trans_presets.java:2103 +#: build/trans_presets.java:2109 build/trans_presets.java:2115 +#: build/trans_presets.java:2121 build/trans_presets.java:2127 msgid "track" msgid_plural "tracks" @@ -6691,5 +7433,5 @@ msgstr[1] "GPS spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159 msgid "point" msgid_plural "points" @@ -6697,5 +7439,5 @@ msgstr[1] "punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188 #, java-format msgid "a track with {0} point" @@ -6704,5 +7446,5 @@ msgstr[1] "et GPS spor med {0} punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 #, java-format msgid "{0} consists of {1} track" @@ -6711,5 +7453,5 @@ msgstr[1] "{0} består av {1} GPS spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 #, java-format msgid "{0} point" @@ -6718,9 +7460,9 @@ msgstr[1] "{0} punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151 msgid "gps marker" msgstr "GPS-flagg" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172 msgid "marker" msgid_plural "markers" @@ -6728,5 +7470,5 @@ msgstr[1] "flagg" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6745,5 +7487,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250 #, java-format msgid "Audio synchronized at point {0}." @@ -6751,5 +7493,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259 msgid "Unable to synchronize in layer being played." msgstr "Kan ikke synkronisere i det avspillte lag." @@ -6777,5 +7519,5 @@ msgstr "Slå av/på visning av tekst/ikoner" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6785,5 +7527,5 @@ "(etter første markør)." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6793,29 +7535,29 @@ "i track for synkronisering." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241 msgid "Unable to create new audio marker." msgstr "Kan ikke sette ny audio-markør" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 msgid "There was an error while trying to display the URL for this marker" msgstr "Der opstod en feil i forsøket på å vise URL'en for denne markøren" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "(URL was: " msgstr "(URL var: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "Error displaying URL" msgstr "Feil ved visning av URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 msgid "Advanced Preferences" msgstr "Avanserte innstillinger" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Setting Preference entries directly. Use with caution!" msgstr "Endre innstillingerne direkte. Vær varsom!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6823,14 +7565,14 @@ msgstr "Søk: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100 msgid "Current value is default." msgstr "Nåværende verdi er standard." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102 #, java-format msgid "Default value is ''{0}''." msgstr "Standardverdien er «{0}»." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" @@ -6838,13 +7580,13 @@ "enda)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654 msgid "Please select the row to edit." msgstr "Velg raden som skal endres" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6852,14 +7594,14 @@ msgstr "Ny verdi for {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Velg raden som skal slettes" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 msgid "Enter a new key/value pair" msgstr "Gi en ny nøkkel med verdi" @@ -6994,40 +7736,40 @@ msgstr "Stemme recorder kalibrering" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Farge" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 #, java-format msgid "Paint style {0}: {1}" msgstr "Tegnestil {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 #, java-format msgid "Layer: {0}" msgstr "Lag: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Velg" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 #, java-format msgid "Choose a color for {0}" msgstr "Velg en farge for {0}g" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 msgid "Set to default" msgstr "Sett til standard" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 msgid "Set all to default" msgstr "Sett alt til standard" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 msgid "Colors used by different objects in JOSM." msgstr "Farger brukt av forskellige objekt i JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Farger" @@ -7071,5 +7813,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Bil" @@ -7091,16 +7833,17 @@ #. item "Public Transport/Subway Entrance" check "Wheelchair" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:323 build/trans_presets.java:649 -#: build/trans_presets.java:852 build/trans_presets.java:871 -#: build/trans_presets.java:885 build/trans_presets.java:907 -#: build/trans_presets.java:944 build/trans_presets.java:957 -#: build/trans_presets.java:969 build/trans_presets.java:981 -#: build/trans_presets.java:993 build/trans_presets.java:1005 -#: build/trans_presets.java:1015 build/trans_presets.java:1024 -#: build/trans_presets.java:1033 build/trans_presets.java:1425 -#: build/trans_presets.java:1498 +#: build/trans_presets.java:324 build/trans_presets.java:650 +#: build/trans_presets.java:857 build/trans_presets.java:876 +#: build/trans_presets.java:890 build/trans_presets.java:912 +#: build/trans_presets.java:949 build/trans_presets.java:962 +#: build/trans_presets.java:974 build/trans_presets.java:986 +#: build/trans_presets.java:998 build/trans_presets.java:1010 +#: build/trans_presets.java:1020 build/trans_presets.java:1029 +#: build/trans_presets.java:1038 build/trans_presets.java:1437 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Sykkel" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7130,12 +7873,12 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:324 build/trans_presets.java:651 -#: build/trans_presets.java:851 build/trans_presets.java:870 -#: build/trans_presets.java:884 build/trans_presets.java:906 -#: build/trans_presets.java:943 build/trans_presets.java:956 -#: build/trans_presets.java:968 build/trans_presets.java:980 -#: build/trans_presets.java:992 build/trans_presets.java:1004 -#: build/trans_presets.java:1014 build/trans_presets.java:1023 -#: build/trans_presets.java:1032 +#: build/trans_presets.java:325 build/trans_presets.java:649 +#: build/trans_presets.java:856 build/trans_presets.java:875 +#: build/trans_presets.java:889 build/trans_presets.java:911 +#: build/trans_presets.java:948 build/trans_presets.java:961 +#: build/trans_presets.java:973 build/trans_presets.java:985 +#: build/trans_presets.java:997 build/trans_presets.java:1009 +#: build/trans_presets.java:1019 build/trans_presets.java:1028 +#: build/trans_presets.java:1037 msgid "Foot" msgstr "Til fots" @@ -7315,5 +8058,5 @@ #. Show splash screen on startup #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:79 msgid "Show splash screen at startup" msgstr "Vis oppstartsskjerm" @@ -7321,23 +8064,34 @@ #. Show ID in selection #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:84 msgid "Show object ID in selection lists" msgstr "Vis objekt-ID i lister" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87 +#, fuzzy +msgid "Show localized name in selection lists" +msgstr "Vis objekt-ID i lister" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:93 msgid "Draw rubber-band helper line" msgstr "Tegn elastisk hjelpelinje" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:42 msgid "Modeless working (Potlatch style)" msgstr "Arbeide uten ned- og opplasting (Potlatch-metode)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91 +#. Show localized names +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 +#, fuzzy +msgid "Show localized name in selection lists, if available" +msgstr "Vis objekt-ID i lister" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "Ikke behov for å bytte modus. (Potlatch-metode)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109 msgid "Look and Feel" msgstr "Utseende og opplevelse" @@ -7369,54 +8123,54 @@ msgstr "Brukt stil" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45 msgid "Configure available plugins." msgstr "Indstil tilgængelige programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Last ned liste" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100 msgid "Update" msgstr "Oppdater" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Sett opp nettsteder …" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91 msgid "Add JOSM Plugin description URL." msgstr "Legg til URL for liste over programtillegg." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Enter URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128 msgid "Please select an entry." msgstr "Velg en verdi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113 msgid "Edit JOSM Plugin description URL." msgstr "Rediger URL for liste over programtillegg." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "JOSM Plugin description URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141 msgid "Configure Plugin Sites" msgstr "Indstilling på programtillegg sider" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Display Settings" msgstr "Visningsinnstillinger" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "" "Various settings that influence the visual representation of the whole " @@ -7426,41 +8180,41 @@ "prorammet." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Innstillinger for tilkobling" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings for the OSM server." msgstr "Innstillinger for forbindelse til OSM-tjeneren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Map Settings" msgstr "Innstillinger for kart" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the map projection and data interpretation." msgstr "Innstilinger for kartprojeksjon og datafortolkning" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Lydinnstillinger" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Settings for the audio player and audio markers." msgstr "Innstillinger for avspilling av lyd og lyd markering." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 msgid "You have to restart JOSM for some settings to take effect." msgstr "Du må starte JOSM for at enkelte innstillingene skal tre i kraft." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:54 msgid "Display coordinates as" msgstr "Vis koordinater som" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Projeksjonsmetode" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Kartprojeksjon" @@ -7493,12 +8247,4 @@ msgid "Proxy server password" msgstr "Passord for proxy-tjener" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "URL-adressen for OSM-tjeneren (REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "URL-adresse til tjener" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -7525,61 +8271,60 @@ msgstr "Hurtigtast" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61 #, java-format msgid "Short Description: {0}" msgstr "Kort beskrivelse: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 #, java-format msgid "Author: {0}" msgstr "Opphavsperson: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Webpage: {0}" msgstr "Nettside: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Version: {0}" msgstr "Versjon: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248 msgid "Please select the row to copy." msgstr "Velg raden du vil kopiere." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274 msgid "Add a new XML source to the list." msgstr "Legg til ny XML kilde i liste." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Delete the selected source from the list." msgstr "Slett den valgte kilden fra lista." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -7765,36 +8510,59 @@ msgstr "Kombinasjonstast grupper:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:351 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 +#, java-format +msgid "Remove old keys from up to {0} object" +msgid_plural "Remove old keys from up to {0} objects" +msgstr[0] "Fjern gamle egenskapsnøkler fra {0} objekt" +msgstr[1] "Fjern gamle egenskapsnøkler fra {0} objekt" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Legg til nytt lag" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Slett valgt Lag." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Mer informasjon om denne funksjonen" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 msgid "Optional Attributes:" msgstr "Valgfrie attributter:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:498 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Bruk objektmal «{0}» i gruppe «{1}»" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:499 #, java-format msgid "Use preset ''{0}''" msgstr "Bruk objektmal «{0}»" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 msgid "closedway" msgstr "stengt_vei" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:544 #, java-format msgid "Unknown type: {0}" msgstr "Ukjent type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 #, java-format @@ -7802,15 +8570,15 @@ msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:631 #, java-format msgid "Error parsing {0}: " msgstr "Feil ved lesing av {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #, java-format msgid "Elements of type {0} are supported." msgstr "Element type {0} kan brukes." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:702 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7820,22 +8588,22 @@ msgstr[1] "Endre {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Intet er valgt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "Utvalget passer ikke formålet!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Bruk Objektmal" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Endre egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 #, java-format msgid "Preset group ''{0}''" @@ -7874,11 +8642,11 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:38 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184 #, java-format msgid "Could not read \"{0}\"" msgstr "Klarte ikke lese «{0}»" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:39 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -7888,38 +8656,38 @@ "spor." -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43 -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:42 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:24 msgid "GPX Files" msgstr "GPX filer" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "beskrivelse av sporloggen" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Legg til informasjon om opphavsperson" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Fullt navn" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:84 msgid "E-Mail" msgstr "E-post" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:88 msgid "Copyright (URL)" msgstr "Opphavsrett (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Forhåndsvalgt" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "År for opphavsrett" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Stikkord" @@ -7929,9 +8697,9 @@ msgstr "Innstillinger for eksport" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Eksporter og lagre" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -7942,10 +8710,10 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:258 msgid "Choose a predefined license" msgstr "Velg en lisens" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 @@ -7955,12 +8723,12 @@ msgstr "Markører fra {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:41 #, java-format msgid "File \"{0}\" does not exist" msgstr "Fila «{0}» finnes ikke" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:44 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7982,6 +8750,6 @@ "Lokalt datasett har ikke noe element med ID {0}. Elementtype er ukjent." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:325 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:348 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -7991,20 +8759,40 @@ msgstr "Laster ned OSM-data …" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 -#, java-format -msgid "Fetching {0} with id {1} from ''{2}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:375 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#, java-format +msgid "Fetching way with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:377 +#, fuzzy, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "Rediger relasjon #{0} i lag \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "Tjeneren svarte med HTTP 404 for ID {0} – hopper over." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 -#, java-format -msgid "Fetching a package of {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:414 +#, java-format +msgid "Fetching a package of ways from ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:415 +#, fuzzy, java-format +msgid "Fetching a package of relations from ''{0}''" +msgstr "Ingenting lagt til utvalg ved søk etter «{0}»" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8014,34 +8802,34 @@ "element." -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 msgid "NMEA-0183 Files" msgstr "NMEA-0183 filer" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Importerte koordinater: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Ugyldig koding: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Feil i kontrollsum: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Ukjent koding: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Koodinater med null: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "NMEA data er lest inn" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "Feil ved import av NMEA data!" @@ -8052,9 +8840,9 @@ msgstr "Innstilling «{0}» mangler. Kan ikke starte OSM-API." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 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:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -8064,15 +8852,15 @@ "Den støtter protokollversjon 0.5 og 0.6, mens tjeneren støtter {0} til {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178 #, 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:237 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:238 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "Uventet ID-format i svar fra tjener – leste «{0}»" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -8080,33 +8868,91 @@ msgstr "Uventet format for ny versjon av endret element «{0}»: «{1}»" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -msgid "Opening changeset..." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 +#, fuzzy +msgid "Creating changeset..." msgstr "Åpner endringssett …" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:316 +#, java-format +msgid "Successfully opened changeset {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 +msgid "No currently open changeset. Opening a new changeset..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310 +msgid "" +"Warning: could not reuse an existing changeset as requested. Opening a new " +"one." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318 +#, fuzzy, java-format +msgid "Reusing existing changeset {0}" +msgstr "Åpner endringssett …" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Åpner endringssett …" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:340 +#, java-format +msgid "Changeset {0} is unchanged. Skipping update." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#, fuzzy, java-format +msgid "Updating changeset {0}..." +msgstr "Åpner endringssett …" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +msgid "" +"Failed to update changeset. Either there is no current changeset or the id " +"of the current changeset is 0" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 msgid "Closing changeset..." msgstr "Lukker endringssett …" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 +#, fuzzy, java-format +msgid "Closing changeset {0}..." +msgstr "Lukker endringssett …" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Åpner endringssett …" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "No changeset present for diff upload" msgstr "Ingen base med rettinger tilstede for opplasting" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "Preparing..." msgstr "Forbereder …" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Laster opp …" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#, java-format +msgid "Starting retry {0} of {1} in {2} seconds ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:515 #, java-format msgid "Starting retry {0} of {1}." @@ -8134,29 +8980,33 @@ msgstr "Ugyldig bzip2-fil" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Feil passord eller brukernavn." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168 msgid "Warning: The password is transferred unencrypted." msgstr "Advarsel: Passordet overføres ukryptert." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172 msgid "Save user and password (unencrypted)" msgstr "Lagre bruker og passord (ukryptert)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Skriv inn passord" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Logg inn" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242 +msgid "The base URL for the OSM server (REST API)" +msgstr "URL-adressen for OSM-tjeneren (REST API)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "E-postadresse for OSM-kontoen" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244 msgid "" "Login password to the OSM account. Leave blank to not store any password." @@ -8165,13 +9015,17 @@ "noen passord." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "URL-adresse til tjener" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "OSM-brukernavn (e-post)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 msgid "OSM password" msgstr "OSM passord" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 msgid "" "WARNING: The password is stored in plain text in the preferences file." @@ -8183,20 +9037,20 @@ "
Ikke bruk et verdifullt passord." -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "OSM-tjenerfiler" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../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:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8205,5 +9059,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8408,35 +9262,46 @@ "Kunne ikke koble til OSM-tjeneren. Kontroller internett-tilkoblingen din." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:104 +#, fuzzy, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "{0}% ({1}/{2}), {3}gjenstår. laster {4}: {5} (id: {6})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 -#, java-format -msgid "" -"Failed to close changeset {0}, will be closed by server after timeout. " -"Exception was: {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105 +#, fuzzy, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" +msgstr "{0}% ({1}/{2}), {3}gjenstår. laster {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106 +#, fuzzy, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" +msgstr "{0}% ({1}/{2}), {3}gjenstår. laster {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189 #, java-format msgid "" "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to " -"use changesets, but API is not able to handle them. Ignoring changesets." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +"use diff uploads, but API is not able to handle them. Ignoring diff upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:194 +#, fuzzy +msgid "Starting to upload in one request ..." +msgstr "Ingen endringer å laste opp. Finn frem data først." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 +msgid "Starting to upload with one request per primitive ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update Plugins" msgstr "Opdater programtillegg" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Last ned Programtillegg" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8449,5 +9314,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -8456,23 +9321,23 @@ msgstr[1] "{0} programtillegg lastet ned. Start JOSM på nytt." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75 #, java-format msgid "Downloading Plugin {0}..." msgstr "Laster ned programtillegg {0} …" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 msgid "Skip download" msgstr "Hopp over nedlasting" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "JOSM versjon {0} er nødvendig for programtillegg {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Download Plugin" msgstr "Last ned programtillegg" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Skip Download" msgstr "Hopp over nedlasting" @@ -8483,15 +9348,15 @@ msgstr "Det oppsto feil i programtillegget {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:70 #, java-format msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:90 #, 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:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." @@ -8499,15 +9364,15 @@ "Programtillegget {1} er avhengig av programtillegg {0} men ble ikke funnet." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123 #, java-format msgid "Plugin not found: {0}." msgstr "Fant ikke programtillegget: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140 #, 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:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:142 msgid "" "(You can change the number of days after which this warning appears
by " @@ -8517,21 +9382,21 @@ "oppstettet 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:175 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Disable plugin" msgstr "Fjern programtillegg" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 #, 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:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 msgid "Keep plugin" msgstr "Behold programtillegg" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -8541,5 +9406,5 @@ "skrive over eksisterende." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8547,10 +9412,10 @@ msgstr "Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:285 #, 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:289 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -8558,9 +9423,9 @@ "Prøv å oppdatere til ny versjon av programtillegg før du sender feilmelding." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290 msgid "Should the plugin be disabled?" msgstr "Skal programtillegget fjernes?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:299 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -8570,13 +9435,13 @@ "lese programtillegg." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "The plugin could not be removed. Probably it was already disabled" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 msgid "Plugin information" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:355 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" @@ -8587,5 +9452,5 @@ msgstr "Flere detaljer" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -8594,18 +9459,18 @@ msgstr[1] "Lastet ned informasjon om programtillegg fra {0} tjenere" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Fant ikke info om programtillegg." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "Plug-in named {0} is not available. Update skipped." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93 msgid "All installed plugins are up to date." msgstr "Alle installerte programtillegg er siste versjon." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8618,9 +9483,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 msgid "Download missing plugins" msgstr "Last ned programtillegg som mangler" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8633,35 +9498,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versjon {1} {2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 msgid "Plugin bundled with JOSM" msgstr "Programtillegg inkludert i JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Feil oppsto ved lesing av info om programtillegg: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:301 msgid "This is after the end of the recording" msgstr "Dette er etter avsluttingen av opptaket" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Feil med avspilling av lyd" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Ikke gjør noe" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Rapporter feil" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8675,14 +9540,14 @@ "versjon av JOSM, setter vi pris på en feilrapport." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "En uventet unntakstilstand" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 #, java-format msgid "Please report a ticket at {0}" msgstr "Venligst send en feilrapport på {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -8691,5 +9556,5 @@ "Vær detaljert. Bruk engelsk." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -8699,19 +9564,19 @@ "sender feilrapport." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "Be sure to include the following information:" msgstr "Husk å inkludere følgende informasjon:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 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/I18n.java:119 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." msgstr "Fant ikke oversettelsen for {0}. Bruker {1}." -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182 #, java-format msgid "" @@ -8720,5 +9585,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8727,5 +9592,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8738,5 +9603,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 msgid "" "This action will have no shortcut.\n" @@ -8746,5 +9611,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8755,21 +9620,56 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Hint: Du kan endre hurtigtastene i Innstillinger.)" -#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 -#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 -#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:56 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:75 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:87 #, java-format msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 -#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:60 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:80 #, java-format msgid "" "Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " "was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#, java-format +msgid "" +"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window " +"geometry from preferences." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#, java-format +msgid "" +"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got " +"{2}. Can''t restore window geometry from preferences." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#, java-format +msgid "" +"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: " +"{2}. Can''t restore window geometry from preferences." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#, java-format +msgid "" +"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry " +"from preferences." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#, java-format +msgid "" +"Warning: failed to restore window geometry from key ''{0}''. Falling back to " +"default geometry. Details: {1}" msgstr "" @@ -8798,9 +9698,27 @@ msgstr "Lag rutenett med linjer" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:59 +msgid "Private (only shared as anonymous, unordered points)" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:60 +msgid "Public (shown in trace list and as anonymous, unordered points)" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:61 +msgid "Trackable (only shared as anonymous, ordered points with timestamps)" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:62 +msgid "" +"Identifiable (shown in trace list and as identifiable, ordered points with " +"timestamps)" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 msgid "Upload Trace" msgstr "Last opp sporlogg" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -8808,29 +9726,40 @@ msgstr "Last opp sporlogger" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Offentlig" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in openstreetmap.org" -msgstr "" -"Dette medfører at din sporlogg blir offentlig tilgjengelig på openstreetmap." -"org" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:134 +msgid "Visibility" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135 +msgid "Defines the visibility of your trace for other OSM users." +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139 +#, fuzzy +msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" +msgstr "http://www.openstreetmap.org/traces" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139 +msgid "(What does that mean?)" +msgstr "" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 -#: build/trans_presets.java:3017 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:141 +#: build/trans_presets.java:3145 msgid "Description" msgstr "Beskrivelse" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 msgid "Please enter Description about your trace." msgstr "Oppgi en beskrivelse av sporloggen." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:144 +msgid "Tags (comma delimited)" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145 msgid "Please enter tags about your trace." msgstr "Oppgi egenskaper til sporet" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:192 #, java-format msgid "Selected track: {0}" @@ -8838,47 +9767,47 @@ #. Set progress dialog to indeterminate while connecting -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:215 msgid "Connecting..." msgstr "Kobler til …" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 msgid "Upload cancelled" msgstr "Opplastingen ble avsluttet" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:248 msgid "Error while uploading" msgstr "Feil under opplastingen" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:302 msgid "GPX upload was successful" msgstr "GPX opplastingen var vellykket" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 msgid "Upload failed. Server returned the following message: " msgstr "Klarte ikke laste opp. Tjeneren gav følgende svar: " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Laster opp GPX spor: {0}% ({1} av {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 msgid "No description provided. Please provide some description." msgstr "Ingen beskrivelse er gitt. Legg inn beskrivelse av sporet" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:380 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:402 msgid "No GPX layer selected. Cannot upload a trace." msgstr "GPX lag er ikke valgt -> Ingen spor å laste opp." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:383 msgid "No username provided." msgstr "Ingen Brukernavn er oppgitt." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:386 msgid "No password provided." msgstr "Det er ikke oppgitt passord." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:418 msgid "Uploading GPX Track" msgstr "GPX Spor lastes opp" @@ -8991,19 +9920,19 @@ msgstr "Last inn bildesett som et nyt lag." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:130 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "GPX Filer (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Fila {0} er lastet inn under navnet «{1}»" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:175 #, java-format msgid "Error while parsing {0}" msgstr "Feil oppsto ved sending av {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -9014,34 +9943,34 @@ "
Skriv inn tidspunktet og velg tidssone
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:241 msgid "Photo time (from exif):" msgstr "Tidspunkt for foto (fra EXIF):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:256 msgid "Gps time (read from the above photo): " msgstr "Gps tidspunkt (lest i bildet ovenfor): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:268 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:276 msgid "I'm in the timezone of: " msgstr "Jeg er i tidssonen: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:339 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:375 msgid "No date" msgstr "Ingen dato" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:348 msgid "Open an other photo" msgstr "Åpne et annet foto" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:389 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synkroniser tiden fra et bilde på GPS-mottakeren" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:403 msgid "" "Error while parsing the date.\n" @@ -9051,70 +9980,70 @@ "Sjekk format" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:405 msgid "Invalid date" msgstr "Ugyldig dato" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:454 msgid "GPX track: " msgstr "GPX-spor: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:459 msgid "Open another GPX trace" msgstr "Åpne flere GPX-spor" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:475 msgid "Timezone: " msgstr "Tidssone: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:497 msgid "Offset:" msgstr "Forskyvning:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:509 msgid "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?" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:526 msgid "Update position for: " msgstr "Opdater posisjon for: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:535 msgid "All images" msgstr "Alle bilder" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:545 msgid "Images with no exif position" msgstr "Bilder uden EXIF-posisjon" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:555 msgid "Not yet tagged images" msgstr "Bilder uten egenskaper" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:575 msgid "Correlate images with GPX track" msgstr "Jevnfør bilder med GPX spor" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 msgid "Correlate" msgstr "Jevnfør" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 msgid "Auto-Guess" msgstr "Automatisk forslag" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:587 msgid "You should select a GPX track" msgstr "Du bør velge et GPX-spor" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "No selected GPX track" msgstr "Intgen GPX-spor er valgt" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:600 #, java-format msgid "" @@ -9125,9 +10054,9 @@ "Forventet format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 msgid "Invalid timezone" msgstr "Ugyldig tidssone" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:613 #, java-format msgid "" @@ -9138,65 +10067,65 @@ "Forventet format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 msgid "Invalid offset" msgstr "Ugyldig forskyvning" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:657 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "Fant {0} treff av {1} i GPX spor {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 msgid "GPX Track loaded" msgstr "GPX-spor er lagt inn" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:693 msgid "The selected photos don't contain time information." msgstr "Valgte foto har ikke tidskode." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "Photos don't contain time information" msgstr "Foto har ikke tidskode." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:728 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "Valgte GPX spor mangler tidskode. Velg et annet spor." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:729 msgid "GPX Track has no time information" msgstr "GPX sporet har ikke tidskoder" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774 #, java-format msgid "Timezone: {0}" msgstr "Tidssone: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775 #, java-format msgid "Minutes: {0}" msgstr "Minutter: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Seconds: {0}" msgstr "Sekunder: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:793 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "Koplet {0} av {1} foto til GPX spor." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:796 #, java-format msgid "(Time difference of {0} days)" msgstr "(Tidsforskjell på {0} dager)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:803 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "Forskyvning mellom spor og foto: {0}m {1}s" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:865 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -9206,13 +10135,13 @@ "synkronisere bildene manuelt." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "Matching photos to track failed" msgstr "Klarte ikke å koble foto til sporet" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:883 msgid "Adjust timezone and offset" msgstr "Juster tidssone og forskyvning" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Default Values" msgstr "Standardverdier" @@ -9233,5 +10162,5 @@ msgstr "Feil i fil {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9244,12 +10173,11 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:89 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:382 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386 msgid "Select Feuille" -msgstr "Velg alt" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:126 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "Error loading file" msgstr "Feil ved lasting av fil" @@ -9278,8 +10206,8 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, java-format -msgid "" -"Town/city {0} not found or not available in WMS.\n" -"Please check its availibility on www.cadastre.gouv.fr" +#, fuzzy, java-format +msgid "" +"Town/city {0} not found or not available\n" +"or action canceled" msgstr "" "Fransk by/sted {0} ikke funnet eller tilgjengelig i WMS.\n" @@ -9290,21 +10218,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:361 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:365 msgid "Select commune" msgstr "Velg kommune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:350 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354 msgid "Choose from..." msgstr "Velg fra …" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 msgid "Cadastre" msgstr "Matrikkel" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Auto sourcing" msgstr "Auto sourcing" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -9317,37 +10245,48 @@ "Vil du gjenopprette bruken av F11 til å laste ned bilder?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:198 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 msgid "Restore grab shortcut F11" msgstr "Gjenopprett F11-hurtigtast" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM avsluttes for at endringen skal tre i kraft." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:269 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 msgid "Replace original background by JOSM background color." msgstr "Bytt ut original bakgrunn med JOSM bakgrunnfarge." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 msgid "Reverse grey colors (for black backgrounds)." msgstr "Omvend grå farger (for svart bakgrunn)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 msgid "Set background transparent." msgstr "Sett backgrunn transparent." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 msgid "Draw boundaries of downloaded data." msgstr "Vis grenser for nedlatede data." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:174 +msgid "Disable image cropping during georeferencing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Enable automatic caching." msgstr "Aktiviser automatisk mellomlager." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 msgid "Max. cache size (in MB)" msgstr "Max. lager størrelse (i MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:61 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -9364,9 +10303,9 @@ "
før du laster inn data med dette programtillegget." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "Fransk cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -9374,10 +10313,10 @@ "html>" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "Source" msgstr "Kilde" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:172 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -9386,5 +10325,5 @@ "Bytt ut original hvit bacgrunn med fargen angitt i innstillingene for JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -9394,41 +10333,39 @@ "tekst på mørk bakgrunn." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Allows multiple layers stacking" msgstr "Tillat stabling av flere lag" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "Sett transperens på WMS lag. Høyre: opak, venstre: transparent." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Trekk et rektangel rundt data lastet ned fra WMS-tjener." #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:115 msgid "Vector images grab multiplier:" -msgstr "Image grab multiplier:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:128 +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:130 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Hent mindre bilder (høyere kvalitet men minnekrevende)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:138 msgid "Fixed size square (default is 100m)" msgstr "Fast kvadrat størrelse (standard er 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Fast størrelse (fra 25 til 1000 meter)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Raster images grab multiplier:" -msgstr "Image grab multiplier:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -9487,12 +10424,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Kobler til WMS-tjener …" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "Bilde er ikke lest inn" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9526,20 +10461,20 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:85 msgid "" "To enable the cadastre WMS plugin, change\n" "the current projection to one of the cadastre\n" -"projection and retry" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:44 +"projections and retry" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47 msgid "Grab non-georeferenced image" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:68 msgid "Georeferencing interrupted" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:157 msgid "" "Click first corner for image cropping\n" @@ -9547,9 +10482,15 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177 +#, fuzzy +msgid "Image cropping" +msgstr "laster bilde …" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176 msgid "Click second corner for image cropping" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:123 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:196 msgid "" "Click first Lambert crosspiece for georeferencing\n" @@ -9557,31 +10498,39 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:132 -msgid "Click second Lambert crosspiece for georeferencing\n" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:148 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:216 +msgid "Image georeferencing" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:215 +msgid "Click second Lambert crosspiece for georeferencing" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:233 +msgid "" +"Do you want to cancel completely\n" +"or just retry " +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:249 +msgid "Enter cadastre east,north position" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 +msgid "(Warning: verify north with arrow !!)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:252 +msgid "East" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:253 +msgid "North" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 #, fuzzy -msgid "Enter cadastre east,north position" -msgstr "Gi inn Lat/Lon for posisjon du vil gå til" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:149 -msgid "(Warning: verify north with arrow !!)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 -#, fuzzy -msgid "East" -msgstr "øst" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "nord" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -#, fuzzy -msgid "Set Lambert coordinate" -msgstr "Behold tjenerens koordinater" +msgid "Set " +msgstr "Velg" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9645,6 +10594,6 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:62 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:137 #, java-format msgid "Simplify Way (remove {0} node)" @@ -9668,6 +10617,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166 msgid "Blank Layer" msgstr "Blankt lag" @@ -9683,7 +10632,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Raster midtpunkt: {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10209,6 +11158,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 #: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3441 -#: build/trans_style.java:3449 +#: build/trans_style.java:1023 build/trans_style.java:3392 +#: build/trans_style.java:3400 msgid "water" msgstr "vann" @@ -10221,8 +11170,4 @@ msgid "land" msgstr "land" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "ingen" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10515,9 +11460,9 @@ msgstr "OpenStreetBugs download-løkke" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:108 msgid "Displays OpenStreetBugs issues" msgstr "Vis tema i OpenStreetBugs" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" "The openstreetbus plugin is using the old server at appspot.com.
A " @@ -10529,5 +11474,5 @@ "nye tjeneren? (Anbefalt)" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97 msgid "Switch to new openstreetbugs server?" msgstr "Bytte til ny openstreetbugs-tjener?" @@ -11100,5 +12045,5 @@ #. item "Buildings/Addresses" text "House name" #: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2192 +#: build/trans_presets.java:2261 msgid "Street name" msgstr "Gatenavn" @@ -11117,29 +12062,29 @@ msgstr "Vis Opphavsmenn Panel" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89 msgid "Open User Page" msgstr "Åpne brukerside" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90 msgid "Open User Page in browser" msgstr "Åpne brukerside i utforsker" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103 msgid "Select User's Data" msgstr "Velg brukers data" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104 msgid "Replaces Selection with Users data" msgstr "Bytt ut utvalg med brukers data" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130 msgid "Please select some data" msgstr "Velg data først" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134 msgid "Please choose a user using the author panel" msgstr "Velg en bruker fra panel med opphavsmenn" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147 msgid "Sorry, doesn't work with anonymous users" msgstr "Beklager. Anonyme brukere får ikke lov til dette." @@ -11153,23 +12098,15 @@ msgstr "Slår sammen områder med overlapp" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 -msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -msgstr "DETTE ER PÅ FORØKSTADIET. Lagre arbeidet og bekreft før opplasting." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 -msgid "Continue anyway" -msgstr "Fortsett uansett" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:134 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127 msgid "Only up to two areas can be joined at the moment." msgstr "Bare to områder kan bli slått sammen foreløpig." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:139 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "«{0}» er ikke lukket, og kan derfor ikke være med i sammenføyning." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:156 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:149 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:65 msgid "" "The selected way(s) have nodes outside of the downloaded data region.\n" @@ -11181,38 +12118,38 @@ "Er du sikker på at du vil fortsette?" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:159 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Angre hvis du er usikker" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:173 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166 msgid "Please select at least one closed way the should be joined." msgstr "Velg minst én lukket linje å sammenføye med." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:181 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174 msgid "No intersection found. Nothing was changed." msgstr "Fant ingen skjæring. Ingen endringer ble gjort." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:203 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196 msgid "Added node on all intersections" msgstr "Noder er lagt til i alle skjæringspunkt" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:227 +#: ../plugins/utilsplugin/src/UtilsPlugin/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)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225 msgid "Fix relations" msgstr "Reparer relasjoner" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230 msgid "Joined self-overlapping area" msgstr "Slo sammen områder som overlappet seg selv" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:238 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 msgid "Joined overlapping areas" msgstr "Slo sammen overlappende områder" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:242 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -11222,81 +12159,81 @@ "oppstått." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Reparer konflikter i egenskaper." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:465 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 msgid "Removed Element from Relations" msgstr "Fjernede Element fra Relasjoner" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:574 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 msgid "Join Areas: Remove Short Ways" msgstr "Slå sammen arealer: fjern korte linjer" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:590 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 msgid "Closed Way" msgstr "Lukket linje" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:857 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 msgid "Remove tags from inner ways" msgstr "Fjern egenskaper fra indre linjer" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:886 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 msgid "Join Areas Function" msgstr "Funksjon Slå sammen Areal" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Jump To Position" msgstr "Gå til Posisjon" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Opens a dialog that allows to jump to a specific location" msgstr "Åpner dialog som lar deg gå til bestemt posisjon" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 msgid "Enter Lat/Lon to jump to position." msgstr "Gi inn Lat/Lon for posisjon du vil gå til" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "Du kan også lime inn URL fra www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 msgid "Zoom (in metres)" msgstr "Zoom (i meter)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 msgid "Jump there" msgstr "Gå dit" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 msgid "Jump to Position" msgstr "Gå til posisjon" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "Kunne ikke tolke Lat / Lon eller zoom. Sjekk input." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 msgid "Unable to parse Lon/Lat" msgstr "Kunne ikke tolke Lat / Lon" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Simplify Way" msgstr "Forenkle linje" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Slett overflødige noder fra en linje." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 msgid "Please select at least one way to simplify." msgstr "Velg minst én linje å forenkle." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:87 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:88 #, java-format msgid "The selection contains {0} way. Are you sure you want to simplify it?" @@ -11306,25 +12243,25 @@ msgstr[1] "Utvalget har {0} linjer. Er du sikker på at du vil forenkle disse?" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Er du sikker?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:92 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 msgid "Validation errors" msgstr "Valideringsfeil" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:90 msgid "No validation errors" msgstr "Ingen valideringsfeil" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:165 msgid "Grid" msgstr "Rutenett" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #, java-format msgid "" @@ -11415,53 +12352,53 @@ msgstr "Kjører datavalidering" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 msgid "Data with errors. Upload anyway?" msgstr "Data med feil. Last opp uansett?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72 msgid "Open the validation window." msgstr "Åpne valideringsvindu" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:79 msgid "Zoom to problem" msgstr "Zoom til problem" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 msgid "Fix" msgstr "Korriger" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 msgid "Fix the selected errors." msgstr "Korriger valgte feilmeldinger." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104 msgid "Ignore" msgstr "Ignorer" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:107 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Ignore the selected errors next time." msgstr "Ignorer valgte feilmeldinger neste gang." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188 msgid "Whole group" msgstr "Hele gruppen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188 msgid "Single elements" msgstr "Enkelte element" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188 msgid "Nothing" msgstr "Intet" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:193 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:189 msgid "Ignore whole group or individual elements?" msgstr "Ignorer hele gruppen eller enkelte element?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:190 msgid "Ignoring elements" msgstr "Ignorerer element" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 #, java-format msgid "Replace \"{0}\" by \"{1}\" for" @@ -11485,23 +12422,56 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -msgid "" -"This test checks if two roads, railways or waterways crosses in the same " -"layer, but are not connected by a node." +#, fuzzy +msgid "" +"This test checks if two roads, railways, waterways or buildings crosses in " +"the same layer, but are not connected by a node." msgstr "" "Denne testen undersøker om to veier, jernbaner eller vannveier krysser i " "samme lag, uten å være knyttet i knutepunkt." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:118 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 +#, fuzzy +msgid "Crossing buildings" +msgstr "Lag bygninger" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 msgid "Crossing ways" msgstr "Kryssende veier" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:72 msgid "Duplicated nodes" msgstr "Dobbelt-Noder" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:43 msgid "This test checks that there are no nodes at the very same location." msgstr "Denne testen sjekker at det ikke er flere Noder med samme posisjon." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 +#, fuzzy +msgid "Nodes at same position" +msgstr "Noder med samme navn" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgid "Confirmation" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76 +#, fuzzy +msgid "Duplicated ways" +msgstr "Fordoble linje" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 +#, fuzzy +msgid "" +"This test checks that there are no ways with same tags and same node " +"coordinates." +msgstr "Denne testen sjekker at det ikke er flere Noder med samme posisjon." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 +#, fuzzy +msgid "Delete duplicate ways" +msgstr "Opprett kopi av linje" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11586,23 +12556,23 @@ msgstr "Denne test sjekker linjer med liknende navn, som kan bety feilstaving." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 msgid "Properties checker :" msgstr "Egenskapskontroll" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "This plugin checks for errors in property keys and values." 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:281 #, 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:294 #, 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:305 #, java-format msgid "" @@ -11613,7 +12583,7 @@ "{0}" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 msgid "Illegal tag/value combinations" msgstr "Ulovlige kombinasjoner Egenskap / Verdi" @@ -11621,80 +12591,80 @@ #. 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:448 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 msgid "Painting problem" msgstr "Problem med visning" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 #, java-format msgid "Key ''{0}'' invalid." msgstr "Nøkkel «{0}» er ugyldig." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 msgid "Tags with empty values" msgstr "Egenskaper uten verdier" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 msgid "Invalid property key" msgstr "Ulovlig egenskapsnøkkel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 msgid "Invalid white space in property key" msgstr "Ulovlig mellomrom i Nøkkel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 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:486 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 msgid "Property values contain HTML entity" msgstr "Egenskap Verdi inneholder HTML koding" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 #, 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:514 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 msgid "Presets do not contain property key" msgstr "Objektmalene inneholder ikke Nøkkelen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 #, 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:537 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 msgid "Presets do not contain property value" msgstr "Objektmalen har ikke Egenskapsverdi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 msgid "FIXMES" msgstr "FIXMEs" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 msgid "Check property keys." msgstr "Sjekk egenskabsnøkler" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 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:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 msgid "Use complex property checker." msgstr "Bruk avansert egenskapskontroll." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 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:623 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 #: ../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 "TagChecker source" msgstr "Egenskapskontroll-kilde" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -11704,82 +12674,82 @@ "org/index.php/User:JLS/speller) eller \"tag checking data files\"." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 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:689 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Edit the selected source." msgstr "Rediger valgt kilde." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691 msgid "Data sources" msgstr "Datakilder" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711 msgid "Check property values." msgstr "Sjekk egenskapsverdier." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 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:720 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719 msgid "Check for FIXMES." msgstr "Se etter FIXMEs" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 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:728 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check for paint notes." msgstr "Finn notater om tegning." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 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:736 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Use default data file." msgstr "Bruk standard datafil." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use the default data file (recommended)." msgstr "Bruk standard datafil (anbefales)." +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739 +msgid "Use default tag ignore file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 -msgid "Use default tag ignore file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Use default spellcheck file." msgstr "Bruk standard fil for stavekontroll." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 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:839 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838 msgid "Fix properties" msgstr "Korriger egenskaper" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959 msgid "Could not find element type" msgstr "Kunne ikke finne element-typen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976 msgid "Could not find warning level" msgstr "Kunne ikke finne advarsels-niveå" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985 #, java-format msgid "Illegal expression ''{0}''" msgstr "Ugyldig uttrykk «{0}»" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 #, java-format msgid "Illegal regular expression ''{0}''" @@ -11924,7 +12894,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4192 build/trans_style.java:4199 -#: build/trans_style.java:4206 build/trans_style.java:4213 -#: build/trans_style.java:4220 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 +#: build/trans_style.java:4179 msgid "building" msgstr "bygning" @@ -11938,5 +12908,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4227 +#: build/trans_style.java:4186 msgid "area" msgstr "område" @@ -12072,5 +13042,5 @@ msgstr "Nådde et kryss" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "Det oppsto en feil" @@ -12138,14 +13108,14 @@ msgstr "Hjelp WMS tilleggsprogram" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 msgid "Rectified Image..." msgstr "Ortografisk korrekt bilde …" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 #, java-format msgid "WMS: {0}" @@ -12156,26 +13126,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 msgid "Custom WMS Link" msgstr "Selvvalgt WMS-adresse" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 msgid "Visit Homepage" msgstr "Gå til hjemmeside" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 msgid "WMS URL or Image ID:" msgstr "WMS-URL eller bilde-ID:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -12183,37 +13153,55 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "No valid WMS URL or id" msgstr "Ingen gyldig WMS-URL eller ID" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 msgid "Adjust WMS" msgstr "Tilpass WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust the position of the selected WMS layer" msgstr "Tilpass posisjon på valgt WMS lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Start adjusting" msgstr "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 +msgid "There are currently no WMS layer to adjust." +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191 -msgid "There are currently no WMS layer to adjust." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#, java-format +msgid "" +"Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing '&' " +"or a trailing '?'." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +msgid "" +"Warning: Fetching WMS tiles is likely to fail. Please check you preference " +"settings." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#, java-format +msgid "Warning: The complete URL is ''{0}''." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 #, java-format msgid "" @@ -12228,105 +13216,145 @@ msgstr "Automatisk nedlasting" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:94 +#, java-format +msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#, fuzzy +msgid "(deactivated)" +msgstr "brukertype" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS lag ({0}) laster automatisk ned i zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS lag ({0}) laster ned i zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#, java-format +msgid "" +"The base URL
''{0}''
for this WML layer does neither end with a " +"''&'' nor with a ''?''.
This is likely to lead to invalid WMS request. " +"You should check your
preference settings.
Do you want to fetch WMS " +"tiles anyway?" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 +msgid "Yes, fetch images" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:194 +#, fuzzy +msgid "Invalid URL?" +msgstr "Ugyldig dato" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "Du har bestilt for stort område. Zoom inn eller bytt oppløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 msgid "Download visible tiles" msgstr "Last ned synlige kartbilder" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Change resolution" msgstr "Bytt oppløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 msgid "Reload erroneous tiles" msgstr "Last ned kartbilder med feil på nytt" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Save WMS layer to file" msgstr "Lagre WMS lag til fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "Lagre WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "les inn WMS lag fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "Last inn WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:392 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Støtter ikke WMS fil versjon;fant {0}, ønsker {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 msgid "File Format Error" msgstr "Feil Fil Format" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166 msgid "Open a blank WMS layer to load data from a file" msgstr "Åpne tomt WMS lag til data fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "Innstillinger WMS Programtillegg" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Rediger liste over WMS-tjenere som vises i WMS-programtillegg" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 msgid "Menu Name" msgstr "Meny Navn" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "Menu Name (Default)" msgstr "Meny Navn (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "WMS URL (Default)" msgstr "WMS URL (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "Gi meny navn og WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" msgstr "Kopier Standard" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Velg minst én linje" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 msgid "Downloader:" msgstr "Nedlaster:" + +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 +#, fuzzy +msgid "WMS Files (*.wms)" +msgstr "TCX filer (*.tcx)" #. * @@ -12725,62 +13753,7 @@ #: build/trans_presets.java:120 build/trans_presets.java:140 #: build/trans_presets.java:177 build/trans_presets.java:197 -#: build/trans_presets.java:1545 build/trans_presets.java:3015 +#: build/trans_presets.java:1557 build/trans_presets.java:3143 msgid "Reference" msgstr "Veinummer" - -#. item "Streets/Motorway" text "Name" -#. item "Streets/Motorway Link" label "Edit Motorway Link" -#. -#. -#. -#. item "Streets/Trunk" text "Name" -#. item "Streets/Trunk Link" text "Reference" -#. -#. item "Streets/Primary" text "Name" -#. item "Streets/Primary Link" label "Edit Primary Link" -#. -#. -#. -#. item "Streets/Secondary" text "Name" -#. item "Streets/Tertiary" text "Name" -#. item "Streets/Unclassified" check "Embankment" -#. item "Streets/Residential" check "Embankment" -#. item "Streets/Living Street" check "Embankment" -#. item "Streets/Service" check "Embankment" -#. item "Streets/Road (Unknown Type)" check "Embankment" -#. item "Streets/Roundabout" check "Embankment" -#. item "Streets/Bridge" text "Name" -#. item "Streets/Tunnel" text "Name" -#. item "Ways/Construction" check "Embankment" -#. item "Ways/Bridleway" check "Embankment" -#. item "Ways/Cycleway" check "Embankment" -#. item "Ways/Footway" check "Embankment" -#. item "Ways/Pedestrian" check "Embankment" -#. item "Ways/Steps" check "Embankment" -#. item "Ways/Path" check "Embankment" -#. item "Water/Drain" text "Name" -#. item "Water/Stream" text "Name" -#. item "Water/Canal" text "Name" -#. item "Water/River" text "Name" -#. item "Railway/Bus Guideway" check "Embankment" -#: build/trans_presets.java:67 build/trans_presets.java:84 -#: build/trans_presets.java:103 build/trans_presets.java:122 -#: build/trans_presets.java:143 build/trans_presets.java:159 -#: build/trans_presets.java:180 build/trans_presets.java:200 -#: build/trans_presets.java:223 build/trans_presets.java:241 -#: build/trans_presets.java:259 build/trans_presets.java:278 -#: build/trans_presets.java:311 build/trans_presets.java:356 -#: build/trans_presets.java:371 build/trans_presets.java:386 -#: build/trans_presets.java:408 build/trans_presets.java:428 -#: build/trans_presets.java:448 build/trans_presets.java:467 -#: build/trans_presets.java:486 build/trans_presets.java:505 -#: build/trans_presets.java:525 build/trans_presets.java:546 -#: build/trans_presets.java:567 build/trans_presets.java:588 -#: build/trans_presets.java:609 build/trans_presets.java:630 -#: build/trans_presets.java:659 build/trans_presets.java:1055 -#: build/trans_presets.java:1063 build/trans_presets.java:1071 -#: build/trans_presets.java:1081 build/trans_presets.java:1300 -msgid "Layer" -msgstr "Lag" #. item "Streets/Motorway" combo "Layer" @@ -12795,5 +13768,5 @@ #: build/trans_presets.java:104 build/trans_presets.java:123 #: build/trans_presets.java:144 build/trans_presets.java:160 -#: build/trans_presets.java:181 build/trans_presets.java:357 +#: build/trans_presets.java:181 build/trans_presets.java:358 msgid "Lanes" msgstr "Kjørebaner" @@ -12808,5 +13781,4 @@ #. item "Streets/Tertiary" combo "Layer" #. item "Streets/Unclassified" combo "Layer" -#. item "Streets/Road (Unknown Type)" combo "Layer" #. item "Streets/Bridge" combo "Layer" #. item "Streets/Tunnel" combo "Layer" @@ -12816,10 +13788,10 @@ #: build/trans_presets.java:182 build/trans_presets.java:201 #: build/trans_presets.java:224 build/trans_presets.java:280 -#: build/trans_presets.java:312 build/trans_presets.java:333 -#: build/trans_presets.java:372 build/trans_presets.java:387 -#: build/trans_presets.java:411 build/trans_presets.java:430 -#: build/trans_presets.java:450 build/trans_presets.java:469 -#: build/trans_presets.java:507 build/trans_presets.java:661 -#: build/trans_presets.java:1302 +#: build/trans_presets.java:313 build/trans_presets.java:334 +#: build/trans_presets.java:373 build/trans_presets.java:388 +#: build/trans_presets.java:412 build/trans_presets.java:431 +#: build/trans_presets.java:452 build/trans_presets.java:472 +#: build/trans_presets.java:510 build/trans_presets.java:666 +#: build/trans_presets.java:1307 msgid "Max. speed (km/h)" msgstr "Hastighetsbegrensning (km/t)" @@ -12863,9 +13835,9 @@ #: build/trans_presets.java:254 build/trans_presets.java:273 #: build/trans_presets.java:293 build/trans_presets.java:306 -#: build/trans_presets.java:319 build/trans_presets.java:351 -#: build/trans_presets.java:403 build/trans_presets.java:423 -#: build/trans_presets.java:443 build/trans_presets.java:462 -#: build/trans_presets.java:481 build/trans_presets.java:500 -#: build/trans_presets.java:654 build/trans_presets.java:1295 +#: build/trans_presets.java:320 build/trans_presets.java:352 +#: build/trans_presets.java:404 build/trans_presets.java:424 +#: build/trans_presets.java:444 build/trans_presets.java:464 +#: build/trans_presets.java:484 build/trans_presets.java:503 +#: build/trans_presets.java:659 build/trans_presets.java:1300 msgid "Oneway" msgstr "Enveiskjøring" @@ -12913,13 +13885,13 @@ #: build/trans_presets.java:219 build/trans_presets.java:237 #: build/trans_presets.java:255 build/trans_presets.java:274 -#: build/trans_presets.java:307 build/trans_presets.java:352 -#: build/trans_presets.java:361 build/trans_presets.java:404 -#: build/trans_presets.java:424 build/trans_presets.java:444 -#: build/trans_presets.java:463 build/trans_presets.java:482 -#: build/trans_presets.java:501 build/trans_presets.java:520 -#: build/trans_presets.java:541 build/trans_presets.java:562 -#: build/trans_presets.java:583 build/trans_presets.java:604 -#: build/trans_presets.java:625 build/trans_presets.java:655 -#: build/trans_presets.java:1296 build/trans_surveyor.java:12 +#: build/trans_presets.java:307 build/trans_presets.java:353 +#: build/trans_presets.java:362 build/trans_presets.java:405 +#: build/trans_presets.java:425 build/trans_presets.java:445 +#: build/trans_presets.java:465 build/trans_presets.java:485 +#: build/trans_presets.java:504 build/trans_presets.java:523 +#: build/trans_presets.java:544 build/trans_presets.java:565 +#: build/trans_presets.java:586 build/trans_presets.java:607 +#: build/trans_presets.java:628 build/trans_presets.java:660 +#: build/trans_presets.java:1301 build/trans_surveyor.java:12 msgid "Bridge" msgstr "Bro" @@ -12961,13 +13933,13 @@ #: build/trans_presets.java:220 build/trans_presets.java:238 #: build/trans_presets.java:256 build/trans_presets.java:275 -#: build/trans_presets.java:308 build/trans_presets.java:353 -#: build/trans_presets.java:377 build/trans_presets.java:405 -#: build/trans_presets.java:425 build/trans_presets.java:445 -#: build/trans_presets.java:464 build/trans_presets.java:483 -#: build/trans_presets.java:502 build/trans_presets.java:521 -#: 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:656 -#: build/trans_presets.java:1297 +#: build/trans_presets.java:308 build/trans_presets.java:354 +#: build/trans_presets.java:378 build/trans_presets.java:406 +#: build/trans_presets.java:426 build/trans_presets.java:446 +#: build/trans_presets.java:466 build/trans_presets.java:486 +#: build/trans_presets.java:505 build/trans_presets.java:524 +#: build/trans_presets.java:545 build/trans_presets.java:566 +#: build/trans_presets.java:587 build/trans_presets.java:608 +#: build/trans_presets.java:629 build/trans_presets.java:661 +#: build/trans_presets.java:1302 msgid "Tunnel" msgstr "Tunnel" @@ -13007,12 +13979,12 @@ #: build/trans_presets.java:221 build/trans_presets.java:239 #: build/trans_presets.java:257 build/trans_presets.java:276 -#: build/trans_presets.java:309 build/trans_presets.java:354 -#: build/trans_presets.java:406 build/trans_presets.java:426 -#: build/trans_presets.java:446 build/trans_presets.java:465 -#: build/trans_presets.java:484 build/trans_presets.java:503 -#: build/trans_presets.java:522 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:657 build/trans_presets.java:1298 +#: build/trans_presets.java:309 build/trans_presets.java:355 +#: build/trans_presets.java:407 build/trans_presets.java:427 +#: build/trans_presets.java:447 build/trans_presets.java:467 +#: build/trans_presets.java:487 build/trans_presets.java:506 +#: build/trans_presets.java:525 build/trans_presets.java:546 +#: build/trans_presets.java:567 build/trans_presets.java:588 +#: build/trans_presets.java:609 build/trans_presets.java:630 +#: build/trans_presets.java:662 build/trans_presets.java:1303 msgid "Cutting" msgstr "Skjæring" @@ -13052,12 +14024,12 @@ #: build/trans_presets.java:222 build/trans_presets.java:240 #: build/trans_presets.java:258 build/trans_presets.java:277 -#: build/trans_presets.java:310 build/trans_presets.java:355 -#: build/trans_presets.java:407 build/trans_presets.java:427 -#: build/trans_presets.java:447 build/trans_presets.java:466 -#: build/trans_presets.java:485 build/trans_presets.java:504 -#: build/trans_presets.java:523 build/trans_presets.java:544 -#: build/trans_presets.java:565 build/trans_presets.java:586 -#: build/trans_presets.java:607 build/trans_presets.java:628 -#: build/trans_presets.java:658 build/trans_presets.java:1299 +#: build/trans_presets.java:310 build/trans_presets.java:356 +#: build/trans_presets.java:408 build/trans_presets.java:428 +#: build/trans_presets.java:448 build/trans_presets.java:468 +#: build/trans_presets.java:488 build/trans_presets.java:507 +#: build/trans_presets.java:526 build/trans_presets.java:547 +#: build/trans_presets.java:568 build/trans_presets.java:589 +#: build/trans_presets.java:610 build/trans_presets.java:631 +#: build/trans_presets.java:663 build/trans_presets.java:1304 msgid "Embankment" msgstr "Øy" @@ -13213,17 +14185,17 @@ #: build/trans_presets.java:225 build/trans_presets.java:243 #: build/trans_presets.java:261 build/trans_presets.java:281 -#: build/trans_presets.java:313 build/trans_presets.java:358 -#: build/trans_presets.java:374 build/trans_presets.java:388 -#: build/trans_presets.java:412 build/trans_presets.java:431 -#: build/trans_presets.java:451 build/trans_presets.java:470 -#: build/trans_presets.java:488 build/trans_presets.java:508 -#: build/trans_presets.java:529 build/trans_presets.java:550 -#: build/trans_presets.java:571 build/trans_presets.java:592 -#: build/trans_presets.java:613 build/trans_presets.java:634 -#: build/trans_presets.java:662 build/trans_presets.java:675 -#: build/trans_presets.java:688 build/trans_presets.java:701 -#: build/trans_presets.java:714 build/trans_presets.java:727 -#: build/trans_presets.java:740 build/trans_presets.java:1303 -#: build/trans_presets.java:1486 build/trans_presets.java:1528 +#: build/trans_presets.java:314 build/trans_presets.java:359 +#: build/trans_presets.java:375 build/trans_presets.java:389 +#: build/trans_presets.java:413 build/trans_presets.java:432 +#: build/trans_presets.java:453 build/trans_presets.java:473 +#: build/trans_presets.java:491 build/trans_presets.java:511 +#: build/trans_presets.java:532 build/trans_presets.java:553 +#: build/trans_presets.java:574 build/trans_presets.java:595 +#: build/trans_presets.java:616 build/trans_presets.java:637 +#: build/trans_presets.java:667 build/trans_presets.java:680 +#: build/trans_presets.java:693 build/trans_presets.java:706 +#: build/trans_presets.java:719 build/trans_presets.java:732 +#: build/trans_presets.java:745 build/trans_presets.java:1308 +#: build/trans_presets.java:1498 build/trans_presets.java:1540 msgid "Width (meters)" msgstr "Bredde ( meter)" @@ -13250,4 +14222,5 @@ #. item "Streets/Service" combo "Layer" #. item "Streets/Parking Aisle" check "Oneway" +#. item "Streets/Road (Unknown Type)" combo "Layer" #. item "Ways/Construction" combo "Layer" #. item "Ways/Bridleway" combo "Layer" @@ -13266,11 +14239,12 @@ #: build/trans_presets.java:242 build/trans_presets.java:260 #: build/trans_presets.java:279 build/trans_presets.java:294 -#: build/trans_presets.java:409 build/trans_presets.java:429 -#: build/trans_presets.java:449 build/trans_presets.java:468 -#: build/trans_presets.java:487 build/trans_presets.java:506 -#: build/trans_presets.java:524 build/trans_presets.java:545 -#: build/trans_presets.java:566 build/trans_presets.java:587 -#: build/trans_presets.java:608 build/trans_presets.java:629 -#: build/trans_presets.java:660 build/trans_presets.java:1301 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:548 build/trans_presets.java:569 +#: build/trans_presets.java:590 build/trans_presets.java:611 +#: build/trans_presets.java:632 build/trans_presets.java:665 +#: build/trans_presets.java:1306 msgid "Surface" msgstr "Veidekke" @@ -13280,4 +14254,5 @@ #. item "Streets/Service" combo "Surface" #. item "Streets/Parking Aisle" combo "Surface" +#. item "Streets/Road (Unknown Type)" combo "Surface" #. item "Ways/Construction" combo "Surface" #. item "Ways/Bridleway" combo "Surface" @@ -13292,9 +14267,10 @@ #: build/trans_presets.java:242 build/trans_presets.java:260 #: build/trans_presets.java:279 build/trans_presets.java:294 -#: build/trans_presets.java:409 build/trans_presets.java:429 -#: build/trans_presets.java:449 build/trans_presets.java:468 -#: build/trans_presets.java:487 build/trans_presets.java:506 -#: build/trans_presets.java:524 build/trans_presets.java:545 -#: build/trans_presets.java:660 build/trans_presets.java:1301 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:548 build/trans_presets.java:665 +#: build/trans_presets.java:1306 msgid "paved" msgstr "fast dekke" @@ -13302,10 +14278,73 @@ #: build/trans_presets.java:242 build/trans_presets.java:260 #: build/trans_presets.java:279 build/trans_presets.java:294 -#: build/trans_presets.java:409 build/trans_presets.java:429 -#: build/trans_presets.java:449 build/trans_presets.java:468 -#: build/trans_presets.java:487 build/trans_presets.java:506 -#: build/trans_presets.java:660 build/trans_presets.java:1301 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 msgid "unpaved" msgstr "uten fast dekke" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "asphalt" +msgstr "Feriehytter" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:548 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +msgid "concrete" +msgstr "betong" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "metal" +msgstr "Bilutleie" + +#. color heath +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 build/trans_style.java:3367 +msgid "wood" +msgstr "skogsområde" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "paving_stones" +msgstr "parkeringsbillett" #. item "Ways/Track Grade 2" combo "Surface" @@ -13313,12 +14352,94 @@ #: build/trans_presets.java:242 build/trans_presets.java:260 #: build/trans_presets.java:279 build/trans_presets.java:294 -#: build/trans_presets.java:409 build/trans_presets.java:429 -#: build/trans_presets.java:449 build/trans_presets.java:468 -#: build/trans_presets.java:487 build/trans_presets.java:506 -#: build/trans_presets.java:524 build/trans_presets.java:545 -#: build/trans_presets.java:566 build/trans_presets.java:587 -#: build/trans_presets.java:660 build/trans_presets.java:1301 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:548 build/trans_presets.java:569 +#: build/trans_presets.java:590 build/trans_presets.java:665 +#: build/trans_presets.java:1306 msgid "cobblestone" msgstr "brostein" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:569 build/trans_presets.java:590 +#: build/trans_presets.java:665 build/trans_presets.java:1306 +msgid "gravel" +msgstr "grus" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "pebblestone" +msgstr "brostein" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "compacted" +msgstr "uferdig" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "grass_paver" +msgstr "gress" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:611 build/trans_presets.java:632 +#: build/trans_presets.java:665 build/trans_presets.java:1306 +msgid "grass" +msgstr "gress" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:569 build/trans_presets.java:590 +#: build/trans_presets.java:611 build/trans_presets.java:632 +#: build/trans_presets.java:665 build/trans_presets.java:1306 +msgid "sand" +msgstr "sand" + +#. item "Ways/Track Grade 4" combo "Surface" +#. item "Ways/Track Grade 5" combo "Surface" +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:569 build/trans_presets.java:590 +#: build/trans_presets.java:611 build/trans_presets.java:632 +#: build/trans_presets.java:665 build/trans_presets.java:1306 +msgid "ground" +msgstr "jord" #. item "Streets/Residential" text "Width (meters)" @@ -13399,20 +14520,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Restriksjoner" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Rediger restriksjioner" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "Avgift" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "Ingen gjennomkjøring" @@ -13425,8 +14546,8 @@ #. item "Ways/Track Grade 4" combo "Layer" #. item "Ways/Track Grade 5" combo "Layer" -#: build/trans_presets.java:322 build/trans_presets.java:526 -#: build/trans_presets.java:547 build/trans_presets.java:568 -#: build/trans_presets.java:589 build/trans_presets.java:610 -#: build/trans_presets.java:631 +#: build/trans_presets.java:323 build/trans_presets.java:529 +#: build/trans_presets.java:550 build/trans_presets.java:571 +#: build/trans_presets.java:592 build/trans_presets.java:613 +#: build/trans_presets.java:634 msgid "Access" msgstr "Adkomst" @@ -13461,32 +14582,47 @@ #. item "Ways/Track Grade 5" combo "Motorcycle" #. item "Ways/Track Grade 5" combo "Motorcar" +#. item "Ways/Path" combo "Foot" +#. item "Ways/Path" combo "Bicycle" +#. item "Ways/Path" combo "Horse" +#. item "Ways/Path" combo "Ski" +#. item "Ways/Path" combo "Snowmobile" #. item "Ways/Path" combo "Motorcar" -#. item "Ways/Path" combo "Snowmobile" -#. item "Ways/Path" combo "Horse" -#. item "Ways/Path" combo "Bicycle" -#. item "Ways/Path" combo "Ski" -#. item "Ways/Path" combo "Foot" +#. item "Car/Parking" combo "Park and Ride" +#. item "Car/Parking" combo "Fee" #. item "Car/Parking" combo "Spaces for Disabled" +#. item "Car/Parking" combo "Spaces for Women" +#. item "Car/Parking" combo "Spaces for Parents" +#. item "Tourism/Information Terminal" combo "Fee" +#. item "Tourism/Audioguide" combo "Fee" #. item "Amenities/Toilets" combo "Fee" +#. item "Amenities/Hunting Stand" combo "Shelter" +#. item "Amenities/Hunting Stand" combo "Hide" +#. item "Amenities/Hunting Stand" combo "Lock" #. item "Health/Pharmacy" combo "Dispensing" -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_presets.java:646 -#: build/trans_presets.java:647 build/trans_presets.java:648 -#: build/trans_presets.java:649 build/trans_presets.java:650 -#: build/trans_presets.java:651 build/trans_presets.java:1387 -#: build/trans_presets.java:2328 build/trans_presets.java:2592 +#: build/trans_presets.java:323 build/trans_presets.java:324 +#: build/trans_presets.java:325 build/trans_presets.java:326 +#: build/trans_presets.java:327 build/trans_presets.java:328 +#: build/trans_presets.java:329 build/trans_presets.java:330 +#: build/trans_presets.java:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:449 +#: build/trans_presets.java:469 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_presets.java:649 +#: build/trans_presets.java:650 build/trans_presets.java:651 +#: build/trans_presets.java:652 build/trans_presets.java:653 +#: build/trans_presets.java:654 build/trans_presets.java:1393 +#: build/trans_presets.java:1394 build/trans_presets.java:1397 +#: build/trans_presets.java:1398 build/trans_presets.java:1399 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:2397 build/trans_presets.java:2439 +#: build/trans_presets.java:2440 build/trans_presets.java:2441 +#: build/trans_presets.java:2711 msgid "yes" msgstr "ja" @@ -13499,40 +14635,40 @@ #. #. -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_style.java:212 +#: build/trans_presets.java:323 build/trans_presets.java:324 +#: build/trans_presets.java:325 build/trans_presets.java:326 +#: build/trans_presets.java:327 build/trans_presets.java:328 +#: build/trans_presets.java:329 build/trans_presets.java:330 +#: build/trans_presets.java:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_style.java:212 msgid "private" msgstr "privat" -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_presets.java:646 -#: build/trans_presets.java:647 build/trans_presets.java:648 -#: build/trans_presets.java:649 build/trans_presets.java:650 -#: build/trans_presets.java:651 +#: build/trans_presets.java:323 build/trans_presets.java:324 +#: build/trans_presets.java:325 build/trans_presets.java:326 +#: build/trans_presets.java:327 build/trans_presets.java:328 +#: build/trans_presets.java:329 build/trans_presets.java:330 +#: build/trans_presets.java:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_presets.java:649 +#: build/trans_presets.java:650 build/trans_presets.java:651 +#: build/trans_presets.java:652 build/trans_presets.java:653 +#: build/trans_presets.java:654 msgid "designated" msgstr "brukertype" @@ -13545,19 +14681,19 @@ #. #. -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_style.java:219 +#: build/trans_presets.java:323 build/trans_presets.java:324 +#: build/trans_presets.java:325 build/trans_presets.java:326 +#: build/trans_presets.java:327 build/trans_presets.java:328 +#: build/trans_presets.java:329 build/trans_presets.java:330 +#: build/trans_presets.java:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_style.java:219 msgid "destination" msgstr "destinasjon" @@ -13580,65 +14716,70 @@ #. #. -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_style.java:205 +#: build/trans_presets.java:323 build/trans_presets.java:324 +#: build/trans_presets.java:325 build/trans_presets.java:326 +#: build/trans_presets.java:327 build/trans_presets.java:328 +#: build/trans_presets.java:329 build/trans_presets.java:330 +#: build/trans_presets.java:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_style.java:205 msgid "permissive" msgstr "permissive" -#: build/trans_presets.java:322 build/trans_presets.java:326 -#: build/trans_presets.java:329 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 +#: build/trans_presets.java:323 build/trans_presets.java:327 +#: build/trans_presets.java:330 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 msgid "agricultural" msgstr "Skog- og Landbruk" -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_presets.java:646 -#: build/trans_presets.java:647 build/trans_presets.java:648 -#: build/trans_presets.java:649 build/trans_presets.java:650 -#: build/trans_presets.java:651 build/trans_presets.java:768 -#: build/trans_presets.java:783 build/trans_presets.java:1325 -#: build/trans_presets.java:1387 build/trans_presets.java:2328 -#: build/trans_presets.java:2592 +#: build/trans_presets.java:323 build/trans_presets.java:324 +#: build/trans_presets.java:325 build/trans_presets.java:326 +#: build/trans_presets.java:327 build/trans_presets.java:328 +#: build/trans_presets.java:329 build/trans_presets.java:330 +#: build/trans_presets.java:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:449 +#: build/trans_presets.java:469 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_presets.java:649 +#: build/trans_presets.java:650 build/trans_presets.java:651 +#: build/trans_presets.java:652 build/trans_presets.java:653 +#: build/trans_presets.java:654 build/trans_presets.java:773 +#: build/trans_presets.java:788 build/trans_presets.java:1330 +#: build/trans_presets.java:1393 build/trans_presets.java:1394 +#: build/trans_presets.java:1397 build/trans_presets.java:1398 +#: build/trans_presets.java:1399 build/trans_presets.java:1763 +#: build/trans_presets.java:1773 build/trans_presets.java:2397 +#: build/trans_presets.java:2439 build/trans_presets.java:2440 +#: build/trans_presets.java:2441 build/trans_presets.java:2711 msgid "no" msgstr "nei" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "Varer" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Tung last (hgv)" @@ -13653,10 +14794,10 @@ #. item "Barriers/Bump Gate" check "Bicycle" #. item "Barriers/Sally Port" check "Bicycle" -#: build/trans_presets.java:327 build/trans_presets.java:648 -#: build/trans_presets.java:853 build/trans_presets.java:886 -#: build/trans_presets.java:908 build/trans_presets.java:945 -#: build/trans_presets.java:958 build/trans_presets.java:970 -#: build/trans_presets.java:982 build/trans_presets.java:994 -#: build/trans_presets.java:1034 +#: build/trans_presets.java:328 build/trans_presets.java:651 +#: build/trans_presets.java:858 build/trans_presets.java:891 +#: build/trans_presets.java:913 build/trans_presets.java:950 +#: build/trans_presets.java:963 build/trans_presets.java:975 +#: build/trans_presets.java:987 build/trans_presets.java:999 +#: build/trans_presets.java:1039 msgid "Horse" msgstr "Hest" @@ -13672,17 +14813,16 @@ #. item "Barriers/Bump Gate" check "Horse" #. item "Barriers/Sally Port" check "Horse" -#: build/trans_presets.java:328 build/trans_presets.java:527 -#: build/trans_presets.java:548 build/trans_presets.java:569 -#: build/trans_presets.java:590 build/trans_presets.java:611 -#: build/trans_presets.java:632 build/trans_presets.java:854 -#: build/trans_presets.java:872 build/trans_presets.java:887 -#: build/trans_presets.java:909 build/trans_presets.java:946 -#: build/trans_presets.java:959 build/trans_presets.java:971 -#: build/trans_presets.java:983 build/trans_presets.java:995 -#: build/trans_presets.java:1035 +#: build/trans_presets.java:329 build/trans_presets.java:530 +#: build/trans_presets.java:551 build/trans_presets.java:572 +#: build/trans_presets.java:593 build/trans_presets.java:614 +#: build/trans_presets.java:635 build/trans_presets.java:859 +#: build/trans_presets.java:877 build/trans_presets.java:892 +#: build/trans_presets.java:914 build/trans_presets.java:951 +#: build/trans_presets.java:964 build/trans_presets.java:976 +#: build/trans_presets.java:988 build/trans_presets.java:1000 +#: build/trans_presets.java:1040 msgid "Motorcycle" msgstr "Motorsykkel" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13694,30 +14834,30 @@ #. item "Barriers/Bump Gate" check "Motorcycle" #. item "Barriers/Sally Port" check "Motorcycle" -#: build/trans_presets.java:329 build/trans_presets.java:528 -#: build/trans_presets.java:549 build/trans_presets.java:570 -#: build/trans_presets.java:591 build/trans_presets.java:612 -#: build/trans_presets.java:633 build/trans_presets.java:646 -#: build/trans_presets.java:873 build/trans_presets.java:888 -#: build/trans_presets.java:910 build/trans_presets.java:947 -#: build/trans_presets.java:960 build/trans_presets.java:972 -#: build/trans_presets.java:984 build/trans_presets.java:996 -#: build/trans_presets.java:1036 +#: build/trans_presets.java:330 build/trans_presets.java:531 +#: build/trans_presets.java:552 build/trans_presets.java:573 +#: build/trans_presets.java:594 build/trans_presets.java:615 +#: build/trans_presets.java:636 build/trans_presets.java:654 +#: build/trans_presets.java:878 build/trans_presets.java:893 +#: build/trans_presets.java:915 build/trans_presets.java:952 +#: build/trans_presets.java:965 build/trans_presets.java:977 +#: build/trans_presets.java:989 build/trans_presets.java:1001 +#: build/trans_presets.java:1041 msgid "Motorcar" msgstr "Motorkjøretøy" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Offentlige Tjenestekjøretøy (psv)" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Motorbåt" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Båt" #. item "Streets/Road Restrictions" text "Max. speed (km/h)" -#: build/trans_presets.java:334 +#: build/trans_presets.java:335 msgid "Min. speed (km/h)" msgstr "Min. hastighet (km/t)" @@ -13725,25 +14865,25 @@ #. item "Streets/Road Restrictions" text "Min. speed (km/h)" #. item "Streets/Bridge" text "Max. speed (km/h)" -#: build/trans_presets.java:335 build/trans_presets.java:373 +#: build/trans_presets.java:336 build/trans_presets.java:374 msgid "Max. weight (tonnes)" msgstr "maks totalvekt" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:336 +#: build/trans_presets.java:337 msgid "Max. Height (meters)" msgstr "Max. Høyde (meter)" #. item "Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:337 +#: build/trans_presets.java:338 msgid "Max. Width (meters)" msgstr "Max. Bredde (meter)" #. item "Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:338 +#: build/trans_presets.java:339 msgid "Max. Length (meters)" msgstr "Max. Lengde (meter)" #. item "Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:340 +#: build/trans_presets.java:341 msgid "Roundabout" msgstr "Rundkjøring" @@ -13754,5 +14894,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:345 +#: build/trans_presets.java:346 msgid "Edit Junction" msgstr "Rediger kryss" @@ -13768,5 +14908,5 @@ #. #. item "Water/Wetland" text "Name" -#. item "Car/Parking" text "Capacity" +#. item "Car/Parking" text "Reference number" #. item "Man Made/Power Generator" label "Edit Power Generator" #. @@ -13774,9 +14914,9 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: build/trans_presets.java:348 build/trans_presets.java:645 -#: build/trans_presets.java:783 build/trans_presets.java:1130 -#: build/trans_presets.java:1386 build/trans_presets.java:2284 -#: build/trans_presets.java:2770 build/trans_presets.java:2780 -#: build/trans_presets.java:2789 +#: build/trans_presets.java:349 build/trans_presets.java:648 +#: build/trans_presets.java:788 build/trans_presets.java:1135 +#: build/trans_presets.java:1392 build/trans_presets.java:2353 +#: build/trans_presets.java:2898 build/trans_presets.java:2908 +#: build/trans_presets.java:2917 msgid "Type" msgstr "Type" @@ -13796,10 +14936,10 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:547 +#: build/trans_presets.java:349 build/trans_style.java:547 #: build/trans_style.java:555 msgid "motorway" msgstr "motorway" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "motorway_link" @@ -13821,10 +14961,10 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:563 +#: build/trans_presets.java:349 build/trans_style.java:563 #: build/trans_style.java:571 msgid "trunk" msgstr "trunk" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "trunk_link" @@ -13846,10 +14986,10 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:579 +#: build/trans_presets.java:349 build/trans_style.java:579 #: build/trans_style.java:587 msgid "primary" msgstr "riksvei" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "tilkjørselsvei_riksvei" @@ -13871,5 +15011,5 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:595 +#: build/trans_presets.java:349 build/trans_style.java:595 #: build/trans_style.java:603 msgid "secondary" @@ -13884,9 +15024,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "kommunevei" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "småvei" @@ -13900,9 +15040,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "boligvei" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "gatetun" @@ -13932,10 +15072,10 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:667 -#: build/trans_style.java:4285 +#: build/trans_presets.java:349 build/trans_style.java:667 +#: build/trans_style.java:4244 msgid "service" msgstr "adkomstvei" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "bus_guideway" msgstr "trikkespor" @@ -13965,6 +15105,6 @@ #. #. color construction -#: build/trans_presets.java:348 build/trans_style.java:877 -#: build/trans_style.java:3257 build/trans_style.java:3258 +#: build/trans_presets.java:349 build/trans_style.java:877 +#: build/trans_style.java:3208 build/trans_style.java:3209 msgid "construction" msgstr "veiarbeid" @@ -13975,10 +15115,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:366 +#: build/trans_presets.java:367 msgid "Edit Bridge" msgstr "Rediger bro" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "Rediger tunnel" @@ -13986,19 +15126,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Gater" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "Veiarbeid" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Rediger vei under bygging" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Kryss" @@ -14014,5 +15154,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "rundkjøring" @@ -14021,5 +15161,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "Ridevei" @@ -14027,5 +15167,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Rediger ridevei" @@ -14033,5 +15173,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Sykkelvei" @@ -14041,11 +15181,17 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" /> -#: build/trans_presets.java:438 +#: build/trans_presets.java:439 msgid "Edit Cycleway" msgstr "Rediger sykkelvei" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Gågate" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Gangvei" @@ -14054,11 +15200,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Rediger gangvei" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Pigghinder" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "Gågate" @@ -14067,5 +15219,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Rediger gågate" @@ -14073,5 +15225,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Trapper" @@ -14081,5 +15233,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:495 +#: build/trans_presets.java:498 msgid "Edit Flight of Steps" msgstr "Rediger trapper" @@ -14088,5 +15240,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "Traktorvei" @@ -14095,39 +15247,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "Rediger traktorvei" -#: build/trans_presets.java:524 build/trans_presets.java:545 -msgid "concrete" -msgstr "betong" - -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 -msgid "gravel" -msgstr "grus" - -#. item "Ways/Track Grade 4" combo "Surface" -#. item "Ways/Track Grade 5" combo "Surface" -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "ground" -msgstr "jord" - -#: build/trans_presets.java:524 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "grass" -msgstr "gress" - -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "sand" -msgstr "sand" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "Traktorvei klasse 1" @@ -14136,5 +15260,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "Rediger traktorvei klasse 1" @@ -14142,5 +15266,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "Traktorvei klasse 2" @@ -14149,5 +15273,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "Rediger traktorvei klasse 2" @@ -14155,5 +15279,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "Traktorvei klasse 3" @@ -14162,5 +15286,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "Rediger traktorvei klasse 3" @@ -14168,5 +15292,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "Traktorvei klasse 4" @@ -14175,5 +15299,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "Rediger traktorvei klasse 4" @@ -14181,5 +15305,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "Traktorvei klasse 5" @@ -14188,5 +15312,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "Rediger traktorvei klasse 5" @@ -14195,5 +15319,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Sti" @@ -14202,19 +15326,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Rediger sti" -#: build/trans_presets.java:647 +#: build/trans_presets.java:652 +msgid "Ski" +msgstr "Ski" + +#: build/trans_presets.java:653 msgid "Snowmobile" msgstr "Snøscooter" -#: build/trans_presets.java:650 -msgid "Ski" -msgstr "Ski" - #. item "Ways/Path" text "Width (meters)" #. -#: build/trans_presets.java:665 +#. item "Tourism/Map" label "Routes shown for:" +#. item "Tourism/Guidepost" label "Routes shown for:" +#: build/trans_presets.java:670 build/trans_presets.java:1725 +#: build/trans_presets.java:1748 msgid "Hiking" msgstr "Tursti" @@ -14224,5 +15351,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:669 +#: build/trans_presets.java:674 msgid "Edit Hiking" msgstr "Rediger tursti" @@ -14230,5 +15357,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "Fjellsti" @@ -14238,5 +15365,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:682 +#: build/trans_presets.java:687 msgid "Edit Mountain Hiking" msgstr "Rediger fjellsti" @@ -14244,5 +15371,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "Krevende fjellsti" @@ -14252,5 +15379,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:695 +#: build/trans_presets.java:700 msgid "Edit Demanding Mountain Hiking" msgstr "Rediger krevende fjellsti" @@ -14258,5 +15385,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "Alpin fjellsti" @@ -14266,5 +15393,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:708 +#: build/trans_presets.java:713 msgid "Edit Alpine Hiking" msgstr "Rediger alpin fjellsti" @@ -14272,5 +15399,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "Krevende alpin fjellsti" @@ -14280,5 +15407,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:721 +#: build/trans_presets.java:726 msgid "Edit Demanding Alpine Hiking" msgstr "Rediger krevende alpin fjellsti" @@ -14286,5 +15413,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "Vanskelig alpin fjellsti" @@ -14294,5 +15421,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:734 +#: build/trans_presets.java:739 msgid "Edit Difficult Alpine Hiking" msgstr "Rediger vanskelig alpin fjellsti" @@ -14300,10 +15427,10 @@ #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:744 +#: build/trans_presets.java:749 msgid "Waypoints" msgstr "Veipunkt" #. group "Waypoints" -#: build/trans_presets.java:745 +#: build/trans_presets.java:750 msgid "Motorway Junction" msgstr "Motorveikryss" @@ -14311,15 +15438,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Rediger motorveikryss" #. item "Waypoints/Motorway Junction" text "Name" -#: build/trans_presets.java:751 +#: build/trans_presets.java:756 msgid "Number" msgstr "Nummer" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "Service" @@ -14327,5 +15454,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "Rediger Serviceområde" @@ -14339,4 +15466,6 @@ #. item "Car/Rental" text "Name" #. item "Car/Sharing" text "Name" +#. item "Tourism/Information Terminal" text "Closer description" +#. item "Tourism/Audioguide" text "Closer description" #. item "Man Made/Power Station" label "Edit Power Station" #. @@ -14356,18 +15485,20 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" #. #. item "Health/Emergency Access Point" text "Point Name" #. item "Relations/Route" text "Network" -#: build/trans_presets.java:760 build/trans_presets.java:897 -#: build/trans_presets.java:1377 build/trans_presets.java:1394 -#: build/trans_presets.java:1401 build/trans_presets.java:1407 -#: build/trans_presets.java:1415 build/trans_presets.java:1422 -#: build/trans_presets.java:2292 build/trans_presets.java:2299 -#: build/trans_presets.java:2315 build/trans_presets.java:2326 -#: build/trans_presets.java:2334 build/trans_presets.java:2341 -#: build/trans_presets.java:2391 build/trans_presets.java:2418 -#: build/trans_presets.java:2573 build/trans_presets.java:2609 -#: build/trans_presets.java:3020 +#: build/trans_presets.java:765 build/trans_presets.java:902 +#: build/trans_presets.java:1382 build/trans_presets.java:1406 +#: build/trans_presets.java:1413 build/trans_presets.java:1419 +#: build/trans_presets.java:1427 build/trans_presets.java:1434 +#: build/trans_presets.java:1761 build/trans_presets.java:1771 +#: build/trans_presets.java:2361 build/trans_presets.java:2368 +#: build/trans_presets.java:2384 build/trans_presets.java:2395 +#: build/trans_presets.java:2403 build/trans_presets.java:2410 +#: build/trans_presets.java:2461 build/trans_presets.java:2509 +#: build/trans_presets.java:2675 build/trans_presets.java:2690 +#: build/trans_presets.java:2729 build/trans_presets.java:3148 msgid "Operator" msgstr "Operatør" @@ -14376,5 +15507,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Trafikklys" @@ -14384,5 +15515,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Type gangfelt" @@ -14391,27 +15522,27 @@ #. item "Waypoints/Pedestrian Crossing" combo "Type" #. item "Railway/Crossing" combo "Crossing type" -#: build/trans_presets.java:768 build/trans_presets.java:783 -#: build/trans_presets.java:1325 +#: build/trans_presets.java:773 build/trans_presets.java:788 +#: build/trans_presets.java:1330 msgid "uncontrolled" msgstr "ukontrollert" -#: build/trans_presets.java:768 build/trans_presets.java:783 -#: build/trans_presets.java:1325 +#: build/trans_presets.java:773 build/trans_presets.java:788 +#: build/trans_presets.java:1330 msgid "traffic_signals" msgstr "trafikklys" -#: build/trans_presets.java:768 build/trans_presets.java:783 -#: build/trans_presets.java:1325 +#: build/trans_presets.java:773 build/trans_presets.java:788 +#: build/trans_presets.java:1330 msgid "island" msgstr "trafikkøy" -#: build/trans_presets.java:768 build/trans_presets.java:783 -#: build/trans_presets.java:1325 +#: build/trans_presets.java:773 build/trans_presets.java:788 +#: build/trans_presets.java:1330 msgid "unmarked" msgstr "umerket" #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle" -#: build/trans_presets.java:769 build/trans_presets.java:785 -#: build/trans_presets.java:1326 +#: build/trans_presets.java:774 build/trans_presets.java:790 +#: build/trans_presets.java:1331 msgid "Cross on horseback" msgstr "Kryssende ridevei" @@ -14419,6 +15550,6 @@ #. item "Waypoints/Traffic Signal" check "Cross on horseback" #. item "Railway/Crossing" check "Cross on horseback" -#: build/trans_presets.java:770 build/trans_presets.java:784 -#: build/trans_presets.java:1327 +#: build/trans_presets.java:775 build/trans_presets.java:789 +#: build/trans_presets.java:1332 msgid "Cross by bicycle" msgstr "Kryssende sykkelvei" @@ -14427,11 +15558,11 @@ #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback" #. item "Railway/Crossing" check "Cross by bicycle" -#: build/trans_presets.java:771 build/trans_presets.java:786 -#: build/trans_presets.java:1328 +#: build/trans_presets.java:776 build/trans_presets.java:791 +#: build/trans_presets.java:1333 msgid "Crossing attendant" msgstr "Betjent fotgjengerfelt" #. item "Waypoints/Traffic Signal" check "Crossing attendant" -#: build/trans_presets.java:772 +#: build/trans_presets.java:777 msgid "Crossing type name (UK)" msgstr "Crossing type name (UK)" @@ -14439,30 +15570,30 @@ #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "zebra" msgstr "zebra" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pelican" msgstr "pelican" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "toucan" msgstr "toucan" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "puffin" msgstr "puffin" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pegasus" msgstr "pegasus" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "tiger" msgstr "tiger" #. -#: build/trans_presets.java:775 +#: build/trans_presets.java:780 msgid "Stop" msgstr "Full stopp" @@ -14470,5 +15601,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Fotgjengerfelt" @@ -14477,14 +15608,14 @@ #. -#: build/trans_presets.java:781 +#: build/trans_presets.java:786 msgid "Edit Crossing" msgstr "Rediger fotgjengerfelt" #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant" -#: build/trans_presets.java:787 +#: build/trans_presets.java:792 msgid "Type name (UK)" msgstr "Type name (UK)" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "Mini-rundkjøring" @@ -14495,14 +15626,14 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" /> #. -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "Direction" msgstr "Retning" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "clockwise" msgstr "med_klokka" -#: build/trans_presets.java:796 +#: build/trans_presets.java:801 msgid "Turning Circle" msgstr "Vendesirkel" @@ -14512,20 +15643,20 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" /> #. -#: build/trans_presets.java:801 +#: build/trans_presets.java:806 msgid "City Limit" msgstr "Bygrense" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Rediger bygrenseskilt" #. item "Waypoints/City Limit" text "Name" -#: build/trans_presets.java:807 +#: build/trans_presets.java:812 msgid "Second Name" msgstr "Annet navn" #. item "Waypoints/City Limit" text "Second Name" -#: build/trans_presets.java:809 +#: build/trans_presets.java:814 msgid "Speed Camera" msgstr "Fotoboks" @@ -14533,5 +15664,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Nødtelefon" @@ -14539,5 +15670,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "Stigning" @@ -14545,5 +15676,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "Sterk stigning" @@ -14552,10 +15683,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "Vadested" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "Rediger vadested" @@ -14563,5 +15694,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Fjellpass" @@ -14569,5 +15700,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Rediger fjellpass" @@ -14575,11 +15706,11 @@ #. item "Waypoints/Mountain Pass" text "Name" #. item "Accomodation/Alpine Hut" text "Name" -#. item "Tourism/Guidepost (Hiking)" text "Name" +#. item "Tourism/Guidepost" text "Name" #. item "Places/Peak" text "Name" #. item "Places/Glacier" text "Name" #. item "Places/Volcano" text "Name" -#: build/trans_presets.java:837 build/trans_presets.java:1588 -#: build/trans_presets.java:1713 build/trans_presets.java:2714 -#: build/trans_presets.java:2721 build/trans_presets.java:2728 +#: build/trans_presets.java:842 build/trans_presets.java:1600 +#: build/trans_presets.java:1745 build/trans_presets.java:2842 +#: build/trans_presets.java:2849 build/trans_presets.java:2856 msgid "Elevation" msgstr "Høyde" @@ -14587,5 +15718,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Stengsel" @@ -14593,5 +15724,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "Sperresøyle" @@ -14599,5 +15730,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "Rediger sperresøyle" @@ -14642,16 +15773,16 @@ #. #. -#: build/trans_presets.java:849 build/trans_presets.java:868 -#: build/trans_presets.java:882 build/trans_presets.java:904 -#: build/trans_presets.java:941 build/trans_presets.java:954 -#: build/trans_presets.java:966 build/trans_presets.java:978 -#: build/trans_presets.java:990 build/trans_presets.java:1002 -#: build/trans_presets.java:1012 build/trans_presets.java:1021 -#: build/trans_presets.java:1030 +#: build/trans_presets.java:854 build/trans_presets.java:873 +#: build/trans_presets.java:887 build/trans_presets.java:909 +#: build/trans_presets.java:946 build/trans_presets.java:959 +#: build/trans_presets.java:971 build/trans_presets.java:983 +#: build/trans_presets.java:995 build/trans_presets.java:1007 +#: build/trans_presets.java:1017 build/trans_presets.java:1026 +#: build/trans_presets.java:1035 msgid "Allowed traffic:" msgstr "Tillatt trafikk:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:856 +#: build/trans_presets.java:861 msgid "Cycle Barrier" msgstr "Halvbommer" @@ -14660,5 +15791,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "Steinblokk" @@ -14666,5 +15797,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Ferist" @@ -14672,10 +15803,10 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "Rediger ferist" #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "Bussluse" @@ -14683,15 +15814,15 @@ #. item #. -#: build/trans_presets.java:878 +#: build/trans_presets.java:883 msgid "Spikes" msgstr "Pigghinder" #. item -#: build/trans_presets.java:879 +#: build/trans_presets.java:884 msgid "Edit Spikes" msgstr "Rediger pigghinder" #. item "Barriers/Spikes" check "Motorcar" -#: build/trans_presets.java:890 +#: build/trans_presets.java:895 msgid "Toll Booth" msgstr "Bomstasjon" @@ -14699,5 +15830,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Rediger bomstasjon" @@ -14705,10 +15836,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:900 +#: build/trans_presets.java:905 msgid "Border Control" msgstr "Tollstasjon" #. item -#: build/trans_presets.java:901 +#: build/trans_presets.java:906 msgid "Edit Border Control" msgstr "Rediger tollstasjon" @@ -14718,5 +15849,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Hekk" @@ -14725,5 +15856,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Gjerde" @@ -14732,5 +15863,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Mur" @@ -14738,5 +15869,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "Bymur" @@ -14745,5 +15876,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "Støttemur" @@ -14755,15 +15886,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Inngang" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Rediger inngang" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "Port" @@ -14771,50 +15902,50 @@ #. item #. -#: build/trans_presets.java:951 +#: build/trans_presets.java:956 msgid "Edit Gate" msgstr "Rediger port" #. item "Barriers/Gate" check "Motorcar" -#: build/trans_presets.java:962 +#: build/trans_presets.java:967 msgid "Lift Gate" msgstr "Veibom" #. item -#: build/trans_presets.java:963 +#: build/trans_presets.java:968 msgid "Edit Lift Gate" msgstr "Rediger veibom" #. item "Barriers/Lift Gate" check "Motorcar" -#: build/trans_presets.java:974 +#: build/trans_presets.java:979 msgid "Hampshire Gate" msgstr "Gjerdestengsel" #. item -#: build/trans_presets.java:975 +#: build/trans_presets.java:980 msgid "Edit Hampshire Gate" msgstr "Rediger gjerdestengsel" #. item "Barriers/Hampshire Gate" check "Motorcar" -#: build/trans_presets.java:986 +#: build/trans_presets.java:991 msgid "Bump Gate" msgstr "Støtfangergjerde" #. item -#: build/trans_presets.java:987 +#: build/trans_presets.java:992 msgid "Edit Bump Gate" msgstr "Rediger støtfangergjerde" #. item "Barriers/Bump Gate" check "Motorcar" -#: build/trans_presets.java:998 +#: build/trans_presets.java:1003 msgid "Kissing Gate" msgstr "Fotgjengerport" #. item -#: build/trans_presets.java:999 +#: build/trans_presets.java:1004 msgid "Edit Kissing Gate" msgstr "Rediger fotgjengerport" #. item "Barriers/Kissing Gate" check "Bicycle" -#: build/trans_presets.java:1007 +#: build/trans_presets.java:1012 msgid "Stile" msgstr "Gjerdetrapp" @@ -14822,25 +15953,25 @@ #. item #. -#: build/trans_presets.java:1009 +#: build/trans_presets.java:1014 msgid "Edit Stile" msgstr "Rediger gjerdetrapp" #. item "Barriers/Stile" check "Bicycle" -#: build/trans_presets.java:1017 +#: build/trans_presets.java:1022 msgid "Turnstile" msgstr "" #. item -#: build/trans_presets.java:1018 +#: build/trans_presets.java:1023 msgid "Edit Turnstile" msgstr "" #. item "Barriers/Turnstile" check "Bicycle" -#: build/trans_presets.java:1026 +#: build/trans_presets.java:1031 msgid "Sally Port" msgstr "Sortiport" #. item -#: build/trans_presets.java:1027 +#: build/trans_presets.java:1032 msgid "Edit Sally Port" msgstr "Rediger sortiport" @@ -14851,10 +15982,10 @@ #. item "Water/River" combo "Layer" #. -#: build/trans_presets.java:1041 build/trans_presets.java:1084 +#: build/trans_presets.java:1046 build/trans_presets.java:1089 msgid "Water" msgstr "Vann" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Vannkilde" @@ -14862,5 +15993,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Rediger vannkilde" @@ -14868,5 +15999,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "Drenering" @@ -14874,10 +16005,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "Rediger drenering" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "Bekk" @@ -14885,10 +16016,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "Rediger bekk" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "Kanal" @@ -14896,10 +16027,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Rediger kanal" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "Elv" @@ -14909,5 +16040,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:1077 +#: build/trans_presets.java:1082 msgid "Edit River" msgstr "Rediger elv" @@ -14915,15 +16046,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Rediger vann" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Land" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Rediger land" @@ -14931,15 +16062,15 @@ #. item "Water/Land" text "Name" #. -#: build/trans_presets.java:1096 +#: build/trans_presets.java:1101 msgid "Basin" msgstr "Basseng" #. item -#: build/trans_presets.java:1097 +#: build/trans_presets.java:1102 msgid "Edit Basin Landuse" msgstr "Rediger basseng" #. item "Water/Basin" text "Name" -#: build/trans_presets.java:1102 +#: build/trans_presets.java:1107 msgid "Reservoir" msgstr "Drikkevannskilde" @@ -14947,15 +16078,15 @@ #. item #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1109 msgid "Edit Reservoir Landuse" msgstr "Rediger drikkevannskilde" #. item "Water/Reservoir" text "Name" -#: build/trans_presets.java:1109 +#: build/trans_presets.java:1114 msgid "Covered Reservoir" msgstr "Tildekt drikkevannskilde" #. item -#: build/trans_presets.java:1110 +#: build/trans_presets.java:1115 msgid "Edit Covered Reservoir" msgstr "Rediger tildekt drikkevannskilde" @@ -14963,5 +16094,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Elvebredd" @@ -14970,10 +16101,10 @@ #. -#: build/trans_presets.java:1118 +#: build/trans_presets.java:1123 msgid "Edit Riverbank" msgstr "Rediger elvebredd" #. item "Water/Riverbank" text "Name" -#: build/trans_presets.java:1122 +#: build/trans_presets.java:1127 msgid "Wetland" msgstr "Våtmarksområde" @@ -14984,14 +16115,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:1127 +#: build/trans_presets.java:1132 msgid "Edit Wetland" msgstr "Rediger våtmarksområde" #. item "Water/Wetland" combo "Type" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "swamp" msgstr "Sumpområde" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "bog" msgstr "Flytemyr" @@ -15005,35 +16136,35 @@ #. #. -#: build/trans_presets.java:1130 build/trans_style.java:3433 +#: build/trans_presets.java:1135 build/trans_style.java:3384 msgid "marsh" msgstr "Myrområde" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "reedbed" msgstr "Sivområde" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "saltmarsh" msgstr "Saltmyr" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "tidalflat" msgstr "Tidevannsflate" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "mangrove" msgstr "Mangrove" -#: build/trans_presets.java:1132 +#: build/trans_presets.java:1137 msgid "Mud" msgstr "Gjørme" #. item -#: build/trans_presets.java:1133 +#: build/trans_presets.java:1138 msgid "Edit Mud" msgstr "Rediger gjørme" #. item "Water/Mud" text "Name" -#: build/trans_presets.java:1137 +#: build/trans_presets.java:1142 msgid "Beach" msgstr "Strand" @@ -15041,20 +16172,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Rediger strand" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "Havbukt" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "Rediger havbukt" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "Klippe" @@ -15062,10 +16193,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Rediger klippe" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "Kystlinje" @@ -15073,5 +16204,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Rediger kystlinje" @@ -15079,5 +16210,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Fergerute" @@ -15085,5 +16216,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "Rediger fergerute" @@ -15092,5 +16223,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "Skipsverft" @@ -15098,10 +16229,10 @@ #. item #. -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1178 msgid "Edit Boatyard" msgstr "Rediger skipsverft" #. item "Water/Boatyard" text "Name" -#: build/trans_presets.java:1178 +#: build/trans_presets.java:1183 msgid "Dock" msgstr "Tørrdokk" @@ -15109,5 +16240,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Rediger tørrdokk" @@ -15115,5 +16246,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Demning" @@ -15121,15 +16252,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Rediger demning" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Punkt i vann" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "Sluseport" @@ -15138,5 +16269,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "Terskeldam" @@ -15144,20 +16275,20 @@ #. item #. -#: build/trans_presets.java:1201 +#: build/trans_presets.java:1206 msgid "Edit Weir" msgstr "Rediger terskeldam" #. item "Waterway Point/Weir" text "Name" -#: build/trans_presets.java:1206 +#: build/trans_presets.java:1211 msgid "Waterfall" msgstr "Foss" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Rediger foss" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "Snuplass" @@ -15166,15 +16297,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "Marina" #. item -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1222 msgid "Edit Marina" msgstr "Rediger marina" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1226 msgid "Pier" msgstr "Brygge" @@ -15182,10 +16313,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Rediger brygge" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "Fergeleie" @@ -15193,10 +16324,10 @@ #. item #. -#: build/trans_presets.java:1229 +#: build/trans_presets.java:1234 msgid "Edit Ferry Terminal" msgstr "Rediger fergeleie" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1233 +#: build/trans_presets.java:1238 msgid "Slipway" msgstr "Båtslipp" @@ -15206,5 +16337,5 @@ #. 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:1237 +#: build/trans_presets.java:1242 msgid "Edit Slipway" msgstr "Rediger båtslipp" @@ -15212,10 +16343,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Jernbane" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "Jernbane" @@ -15223,5 +16354,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Rediger jernbane" @@ -15251,8 +16382,8 @@ #. #. -#: build/trans_presets.java:1249 build/trans_presets.java:1255 -#: build/trans_presets.java:1262 build/trans_presets.java:1268 -#: build/trans_presets.java:1274 build/trans_presets.java:1280 -#: build/trans_presets.java:1286 build/trans_presets.java:1311 +#: build/trans_presets.java:1254 build/trans_presets.java:1260 +#: build/trans_presets.java:1267 build/trans_presets.java:1273 +#: build/trans_presets.java:1279 build/trans_presets.java:1285 +#: build/trans_presets.java:1291 build/trans_presets.java:1316 msgid "Optional Types" msgstr "Alternative typer" @@ -15266,35 +16397,35 @@ #. item "Railway/Tram" combo "Optional Types" #. item "Railway/Disused Rail" combo "Optional Types" -#: build/trans_presets.java:1249 build/trans_presets.java:1255 -#: build/trans_presets.java:1262 build/trans_presets.java:1268 -#: build/trans_presets.java:1274 build/trans_presets.java:1280 -#: build/trans_presets.java:1286 build/trans_presets.java:1311 +#: build/trans_presets.java:1254 build/trans_presets.java:1260 +#: build/trans_presets.java:1267 build/trans_presets.java:1273 +#: build/trans_presets.java:1279 build/trans_presets.java:1285 +#: build/trans_presets.java:1291 build/trans_presets.java:1316 msgid "yard" msgstr "Stasjonsområde" -#: build/trans_presets.java:1249 build/trans_presets.java:1255 -#: build/trans_presets.java:1262 build/trans_presets.java:1268 -#: build/trans_presets.java:1274 build/trans_presets.java:1280 -#: build/trans_presets.java:1286 build/trans_presets.java:1311 +#: build/trans_presets.java:1254 build/trans_presets.java:1260 +#: build/trans_presets.java:1267 build/trans_presets.java:1273 +#: build/trans_presets.java:1279 build/trans_presets.java:1285 +#: build/trans_presets.java:1291 build/trans_presets.java:1316 msgid "siding" msgstr "Sidespor" -#: build/trans_presets.java:1249 build/trans_presets.java:1255 -#: build/trans_presets.java:1262 build/trans_presets.java:1268 -#: build/trans_presets.java:1274 build/trans_presets.java:1280 -#: build/trans_presets.java:1286 build/trans_presets.java:1311 +#: build/trans_presets.java:1254 build/trans_presets.java:1260 +#: build/trans_presets.java:1267 build/trans_presets.java:1273 +#: build/trans_presets.java:1279 build/trans_presets.java:1285 +#: build/trans_presets.java:1291 build/trans_presets.java:1316 msgid "spur" msgstr "Privat sidespor" -#: build/trans_presets.java:1251 +#: build/trans_presets.java:1256 msgid "Narrow Gauge Rail" msgstr "Smal jernbane" #. item -#: build/trans_presets.java:1252 +#: build/trans_presets.java:1257 msgid "Edit Narrow Gauge Rail" msgstr "Rediger smal jernbane" -#: build/trans_presets.java:1257 +#: build/trans_presets.java:1262 msgid "Monorail" msgstr "Monorail" @@ -15302,45 +16433,45 @@ #. item #. -#: build/trans_presets.java:1259 +#: build/trans_presets.java:1264 msgid "Edit Monorail" msgstr "Rediger Monorail" -#: build/trans_presets.java:1264 +#: build/trans_presets.java:1269 msgid "Preserved" msgstr "Fredet bane" #. item -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1270 msgid "Edit Preserved Railway" msgstr "Rediger fredet bane" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1275 msgid "Light Rail" msgstr "Bybane" #. item -#: build/trans_presets.java:1271 +#: build/trans_presets.java:1276 msgid "Edit Light Rail" msgstr "Rediger bybane" -#: build/trans_presets.java:1276 +#: build/trans_presets.java:1281 msgid "Subway" msgstr "T-bane" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "Rediger T-bane" -#: build/trans_presets.java:1282 +#: build/trans_presets.java:1287 msgid "Tram" msgstr "Trikk" #. item -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1288 msgid "Edit Tram" msgstr "Rediger trikk" -#: build/trans_presets.java:1288 +#: build/trans_presets.java:1293 msgid "Bus Guideway" msgstr "Busspor" @@ -15348,5 +16479,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "Rediger busspor" @@ -15355,14 +16486,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "Nedlagt jernbane" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Rediger nedlagt jernbane" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "Revet jernbane" @@ -15371,5 +16502,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "Planovergang" @@ -15378,5 +16509,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "Fotgjengerfelt" @@ -15386,5 +16517,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "Type fotgjengerfelt" @@ -15392,5 +16523,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "Dreieskive" @@ -15399,10 +16530,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Taubaner og -heiser" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Stolheis" @@ -15410,10 +16541,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Rediger stolheis" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "T-krokheis" @@ -15421,10 +16552,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Rediger T-krokheis" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "Taubane" @@ -15432,10 +16563,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Rediger taubane" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "Gondolbane" @@ -15443,5 +16574,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "Rediger gondolbane" @@ -15449,5 +16580,5 @@ #. item "Aerialway/Gondola" text "Name" #. group "Public Transport" -#: build/trans_presets.java:1361 build/trans_presets.java:1449 +#: build/trans_presets.java:1366 build/trans_presets.java:1461 msgid "Station" msgstr "Stasjon" @@ -15458,10 +16589,10 @@ #. -#: build/trans_presets.java:1363 build/trans_presets.java:1452 +#: build/trans_presets.java:1368 build/trans_presets.java:1464 msgid "Edit Station" msgstr "Rediger stasjon" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "Bensinstasjon" @@ -15471,9 +16602,238 @@ #. 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:1374 +#: build/trans_presets.java:1379 msgid "Edit Fuel" msgstr "Rediger bensinstasjon" #. item "Car/Fuel" text "Operator" +#. item "Food+Drinks/Cafe" text "Name" +#. item "Food+Drinks/Pub" text "Name" +#. item "Food+Drinks/Biergarten" text "Name" +#. item "Food+Drinks/Bar" text "Name" +#. item "Food+Drinks/Nightclub" text "Name" +#. item "Tourism/Attraction" text "Name" +#. item "Tourism/Museum" text "Name" +#. item "Tourism/Zoo" text "Name" +#. item "Tourism/Theme Park" text "Name" +#. item "Tourism/Information Office" text "Name" +#. item "Historic Places/Ruins" text "Name" +#. item "Historic Places/Archaeological Site" text "Name" +#. item "Sport Facilities/Golf Course" text "Name" +#. item "Sport Facilities/Miniature Golf" text "Name" +#. item "Buildings/Library" text "Name" +#. item +#. +#. +#. item "Amenities/Baby Hatch" text "Operator" +#. item "Shops/Supermarket" text "Name" +#. item "Shops/Chemist" text "Name" +#. item "Shops/Convenience Store" text "Name" +#. item "Shops/Kiosk" text "Name" +#. item "Shops/Book Store" text "Name" +#. item "Shops/Travel Agency" text "Name" +#. item "Shops/Butcher" text "Name" +#. item "Shops/Baker" text "Name" +#. item "Shops/Florist" text "Name" +#. item "Shops/Organic" text "Name" +#. item "Shops/Alcohol" text "Name" +#. item "Shops/Beverages" text "Name" +#. item "Shops/Computer" text "Name" +#. item "Shops/Electronics" text "Name" +#. item "Shops/Hifi" text "Name" +#. item "Shops/Furniture" text "Name" +#. item "Shops/Garden Centre" text "Name" +#. item "Shops/Hardware" text "Name" +#. item "Shops/Do-it-yourself-store" text "Name" +#. item "Shops/Stationery" text "Name" +#. item "Shops/Hairdresser" text "Name" +#. item "Shops/Shoes" text "Name" +#. item "Shops/Toys" text "Name" +#. item "Shops/Video" text "Name" +#. item "Shops/Dry Cleaning" text "Name" +#. item "Shops/Laundry" text "Name" +#. item "Shops/Outdoor" text "Name" +#. item "Shops/Sports" text "Name" +#. item "Shops/Optician" text "Name" +#. item "Cash/Bank" text "Operator" +#. item "Cash/Money Exchange" text "Name" +#. item "Health/Doctors" text "Name" +#. item "Health/Dentist" text "Name" +#. item "Health/Pharmacy" text "Name" +#. item "Health/Veterinary" text "Name" +#: build/trans_presets.java:1383 build/trans_presets.java:1621 +#: build/trans_presets.java:1629 build/trans_presets.java:1636 +#: build/trans_presets.java:1643 build/trans_presets.java:1649 +#: build/trans_presets.java:1656 build/trans_presets.java:1663 +#: build/trans_presets.java:1671 build/trans_presets.java:1678 +#: build/trans_presets.java:1686 build/trans_presets.java:1699 +#: build/trans_presets.java:1713 build/trans_presets.java:1810 +#: build/trans_presets.java:1818 build/trans_presets.java:1909 +#: build/trans_presets.java:1915 build/trans_presets.java:2226 +#: build/trans_presets.java:2250 build/trans_presets.java:2433 +#: build/trans_presets.java:2462 build/trans_presets.java:2470 +#: build/trans_presets.java:2476 build/trans_presets.java:2483 +#: build/trans_presets.java:2490 build/trans_presets.java:2496 +#: build/trans_presets.java:2502 build/trans_presets.java:2524 +#: build/trans_presets.java:2531 build/trans_presets.java:2538 +#: build/trans_presets.java:2544 build/trans_presets.java:2551 +#: build/trans_presets.java:2557 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2581 build/trans_presets.java:2588 +#: build/trans_presets.java:2595 build/trans_presets.java:2602 +#: build/trans_presets.java:2608 build/trans_presets.java:2614 +#: build/trans_presets.java:2620 build/trans_presets.java:2626 +#: build/trans_presets.java:2632 build/trans_presets.java:2639 +#: build/trans_presets.java:2646 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2676 build/trans_presets.java:2684 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2713 build/trans_presets.java:2740 +msgid "Opening Hours" +msgstr "Åpningstider" + +#. item "Car/Fuel" combo "Opening Hours" +#. item "Food+Drinks/Restaurant" combo "Opening Hours" +#. item "Food+Drinks/Fast Food" combo "Opening Hours" +#. item "Food+Drinks/Cafe" combo "Opening Hours" +#. item "Food+Drinks/Pub" combo "Opening Hours" +#. item "Food+Drinks/Biergarten" combo "Opening Hours" +#. item "Food+Drinks/Bar" combo "Opening Hours" +#. item "Food+Drinks/Nightclub" combo "Opening Hours" +#. item "Tourism/Museum" combo "Opening Hours" +#. item "Tourism/Zoo" combo "Opening Hours" +#. item "Tourism/Theme Park" combo "Opening Hours" +#. item "Tourism/Information Office" combo "Opening Hours" +#. item "Historic Places/Ruins" combo "Opening Hours" +#. item "Historic Places/Archaeological Site" combo "Opening Hours" +#. item "Sport Facilities/Golf Course" combo "Opening Hours" +#. item "Sport Facilities/Miniature Golf" combo "Opening Hours" +#. item "Buildings/Library" combo "Opening Hours" +#. item "Buildings/Place of Worship" combo "Opening Hours" +#. item "Amenities/Bench" combo "Opening Hours" +#. item "Shops/Supermarket" combo "Opening Hours" +#. item "Shops/Chemist" combo "Opening Hours" +#. item "Shops/Convenience Store" combo "Opening Hours" +#. item "Shops/Kiosk" combo "Opening Hours" +#. item "Shops/Book Store" combo "Opening Hours" +#. item "Shops/Travel Agency" combo "Opening Hours" +#. item "Shops/Butcher" combo "Opening Hours" +#. item "Shops/Baker" combo "Opening Hours" +#. item "Shops/Florist" combo "Opening Hours" +#. item "Shops/Organic" combo "Opening Hours" +#. item "Shops/Alcohol" combo "Opening Hours" +#. item "Shops/Beverages" combo "Opening Hours" +#. item "Shops/Computer" combo "Opening Hours" +#. item "Shops/Electronics" combo "Opening Hours" +#. item "Shops/Hifi" combo "Opening Hours" +#. item "Shops/Furniture" combo "Opening Hours" +#. item "Shops/Garden Centre" combo "Opening Hours" +#. item "Shops/Hardware" combo "Opening Hours" +#. item "Shops/Do-it-yourself-store" combo "Opening Hours" +#. item "Shops/Stationery" combo "Opening Hours" +#. item "Shops/Hairdresser" combo "Opening Hours" +#. item "Shops/Shoes" combo "Opening Hours" +#. item "Shops/Toys" combo "Opening Hours" +#. item "Shops/Video" combo "Opening Hours" +#. item "Shops/Dry Cleaning" combo "Opening Hours" +#. item "Shops/Laundry" combo "Opening Hours" +#. item "Shops/Outdoor" combo "Opening Hours" +#. item "Shops/Sports" combo "Opening Hours" +#. item "Shops/Optician" combo "Opening Hours" +#. item "Cash/Bank" combo "Opening Hours" +#. item "Cash/Money Exchange" combo "Opening Hours" +#. item "Health/Doctors" combo "Opening Hours" +#. item "Health/Dentist" combo "Opening Hours" +#. item "Health/Pharmacy" combo "Opening Hours" +#. item "Health/Veterinary" combo "Opening Hours" +#: build/trans_presets.java:1383 build/trans_presets.java:1621 +#: build/trans_presets.java:1629 build/trans_presets.java:1636 +#: build/trans_presets.java:1643 build/trans_presets.java:1649 +#: build/trans_presets.java:1656 build/trans_presets.java:1663 +#: build/trans_presets.java:1678 build/trans_presets.java:1686 +#: build/trans_presets.java:1699 build/trans_presets.java:1713 +#: build/trans_presets.java:1810 build/trans_presets.java:1818 +#: build/trans_presets.java:1909 build/trans_presets.java:1915 +#: build/trans_presets.java:2226 build/trans_presets.java:2250 +#: build/trans_presets.java:2433 build/trans_presets.java:2470 +#: build/trans_presets.java:2476 build/trans_presets.java:2483 +#: build/trans_presets.java:2490 build/trans_presets.java:2496 +#: build/trans_presets.java:2502 build/trans_presets.java:2524 +#: build/trans_presets.java:2531 build/trans_presets.java:2538 +#: build/trans_presets.java:2544 build/trans_presets.java:2551 +#: build/trans_presets.java:2557 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2581 build/trans_presets.java:2588 +#: build/trans_presets.java:2595 build/trans_presets.java:2602 +#: build/trans_presets.java:2608 build/trans_presets.java:2614 +#: build/trans_presets.java:2620 build/trans_presets.java:2626 +#: build/trans_presets.java:2632 build/trans_presets.java:2639 +#: build/trans_presets.java:2646 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2676 build/trans_presets.java:2684 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2713 build/trans_presets.java:2740 +msgid "24/7" +msgstr "" + +#: build/trans_presets.java:1383 build/trans_presets.java:1621 +#: build/trans_presets.java:1629 build/trans_presets.java:1636 +#: build/trans_presets.java:1643 build/trans_presets.java:1649 +#: build/trans_presets.java:1656 build/trans_presets.java:1663 +#: build/trans_presets.java:1678 build/trans_presets.java:1686 +#: build/trans_presets.java:1699 build/trans_presets.java:1713 +#: build/trans_presets.java:1810 build/trans_presets.java:1818 +#: build/trans_presets.java:1909 build/trans_presets.java:1915 +#: build/trans_presets.java:2226 build/trans_presets.java:2250 +#: build/trans_presets.java:2433 build/trans_presets.java:2470 +#: build/trans_presets.java:2476 build/trans_presets.java:2483 +#: build/trans_presets.java:2490 build/trans_presets.java:2496 +#: build/trans_presets.java:2502 build/trans_presets.java:2524 +#: build/trans_presets.java:2531 build/trans_presets.java:2538 +#: build/trans_presets.java:2544 build/trans_presets.java:2551 +#: build/trans_presets.java:2557 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2581 build/trans_presets.java:2588 +#: build/trans_presets.java:2595 build/trans_presets.java:2602 +#: build/trans_presets.java:2608 build/trans_presets.java:2614 +#: build/trans_presets.java:2620 build/trans_presets.java:2626 +#: build/trans_presets.java:2632 build/trans_presets.java:2639 +#: build/trans_presets.java:2646 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2676 build/trans_presets.java:2684 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2713 build/trans_presets.java:2740 +msgid "Mo-Fr 08:30-20:00" +msgstr "" + +#: build/trans_presets.java:1383 build/trans_presets.java:1621 +#: build/trans_presets.java:1629 build/trans_presets.java:1636 +#: build/trans_presets.java:1643 build/trans_presets.java:1649 +#: build/trans_presets.java:1656 build/trans_presets.java:1663 +#: build/trans_presets.java:1678 build/trans_presets.java:1686 +#: build/trans_presets.java:1699 build/trans_presets.java:1713 +#: build/trans_presets.java:1810 build/trans_presets.java:1818 +#: build/trans_presets.java:1909 build/trans_presets.java:1915 +#: build/trans_presets.java:2226 build/trans_presets.java:2250 +#: build/trans_presets.java:2433 build/trans_presets.java:2470 +#: build/trans_presets.java:2476 build/trans_presets.java:2483 +#: build/trans_presets.java:2490 build/trans_presets.java:2496 +#: build/trans_presets.java:2502 build/trans_presets.java:2524 +#: build/trans_presets.java:2531 build/trans_presets.java:2538 +#: build/trans_presets.java:2544 build/trans_presets.java:2551 +#: build/trans_presets.java:2557 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2581 build/trans_presets.java:2588 +#: build/trans_presets.java:2595 build/trans_presets.java:2602 +#: build/trans_presets.java:2608 build/trans_presets.java:2614 +#: build/trans_presets.java:2620 build/trans_presets.java:2626 +#: build/trans_presets.java:2632 build/trans_presets.java:2639 +#: build/trans_presets.java:2646 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2676 build/trans_presets.java:2684 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2713 build/trans_presets.java:2740 +msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" +msgstr "" + #. group "Bicycle" #. -#: build/trans_presets.java:1379 build/trans_presets.java:1426 +#: build/trans_presets.java:1385 build/trans_presets.java:1438 #: build/trans_surveyor.java:24 msgid "Parking" @@ -15493,106 +16853,141 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Rediger parkering" #. item "Car/Parking" text "Name" +#. item "Tourism/Information Terminal" text "Operator" +#. item "Tourism/Audioguide" text "Operator" +#. item "Amenities/Toilets" text "Operator" +#. item "Shops/Vending machine" text "Operator" +#: build/trans_presets.java:1391 build/trans_presets.java:1762 +#: build/trans_presets.java:1772 build/trans_presets.java:2396 +#: build/trans_presets.java:2510 +msgid "Reference number" +msgstr "Referansenummer" + +#. item "Car/Parking" combo "Type" +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "P-hus" + +#: build/trans_presets.java:1392 +msgid "surface" +msgstr "Overflateparkering" + +#: build/trans_presets.java:1392 +msgid "underground" +msgstr "P-kjeller" + +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "Innfartsparkering" + +#. item "Tourism/Information Terminal" text "Reference number" +#. item "Tourism/Audioguide" text "Reference number" +#. item "Amenities/Toilets" text "Reference number" +#: build/trans_presets.java:1394 build/trans_presets.java:1763 +#: build/trans_presets.java:1773 build/trans_presets.java:2397 +msgid "Fee" +msgstr "Gebyr" + +#. +#: build/trans_presets.java:1396 +#, fuzzy +msgid "Capacity (overall)" +msgstr "Kapasitet" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 +msgid "Spaces for Disabled" +msgstr "Handicap-plasser" + +#: build/trans_presets.java:1398 +#, fuzzy +msgid "Spaces for Women" +msgstr "Handicap-plasser" + +#: build/trans_presets.java:1399 +#, fuzzy +msgid "Spaces for Parents" +msgstr "Handicap-plasser" + +#: build/trans_presets.java:1400 +msgid "See the Wiki for other capacity:[types]=*." +msgstr "" + +#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*." +#: build/trans_presets.java:1402 +msgid "Wash" +msgstr "Bilvask" + +#. item +#: build/trans_presets.java:1403 +msgid "Edit Car Wash" +msgstr "Rediger bilvask" + +#. item "Car/Wash" text "Operator" +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1408 build/trans_presets.java:1452 +msgid "Shop" +msgstr "Butikk" + +#. item +#. +#: build/trans_presets.java:1410 +msgid "Edit Car Shop" +msgstr "Rediger bilforretning" + +#. item "Car/Shop" text "Operator" +#: build/trans_presets.java:1415 +msgid "Repair" +msgstr "Verksted" + +#. item +#: build/trans_presets.java:1416 +msgid "Edit Car Repair" +msgstr "Rediger verksted" + +#. item "Car/Repair" text "Operator" +#. item "Bicycle/Parking" text "Capacity" +#: build/trans_presets.java:1421 build/trans_presets.java:1445 +msgid "Rental" +msgstr "Bilutleie" + +#. item +#. +#: build/trans_presets.java:1424 +msgid "Edit Car Rental" +msgstr "Rediger bilutleie" + +#. item "Car/Rental" text "Operator" +#: build/trans_presets.java:1429 +msgid "Sharing" +msgstr "Bildeling" + +#. item +#. +#: build/trans_presets.java:1431 +msgid "Edit Car Sharing" +msgstr "Rediger bildeling" + +#. item +#. +#: build/trans_presets.java:1440 +msgid "Edit Bicycle Parking" +msgstr "Rediger sykkelparkering" + #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 +#: build/trans_presets.java:1443 msgid "Capacity" msgstr "Kapasitet" -#. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 -msgid "surface" -msgstr "Overflateparkering" - -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "P-hus" - -#: build/trans_presets.java:1386 -msgid "underground" -msgstr "P-kjeller" - -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "Innfartsparkering" - -#: build/trans_presets.java:1387 -msgid "Spaces for Disabled" -msgstr "Handicap-plasser" - -#. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1388 build/trans_presets.java:2328 -msgid "Fee" -msgstr "Gebyr" - -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 -msgid "Wash" -msgstr "Bilvask" - -#. item -#: build/trans_presets.java:1391 -msgid "Edit Car Wash" -msgstr "Rediger bilvask" - -#. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 -msgid "Shop" -msgstr "Butikk" - -#. item -#. -#: build/trans_presets.java:1398 -msgid "Edit Car Shop" -msgstr "Rediger bilforretning" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 -msgid "Repair" -msgstr "Verksted" - -#. item -#: build/trans_presets.java:1404 -msgid "Edit Car Repair" -msgstr "Rediger verksted" - -#. item "Car/Repair" text "Operator" -#. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 -msgid "Rental" -msgstr "Bilutleie" - -#. item -#. -#: build/trans_presets.java:1412 -msgid "Edit Car Rental" -msgstr "Rediger bilutleie" - -#. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 -msgid "Sharing" -msgstr "Bildeling" - -#. item -#. -#: build/trans_presets.java:1419 -msgid "Edit Car Sharing" -msgstr "Rediger bildeling" - -#. item -#. -#: build/trans_presets.java:1428 -msgid "Edit Bicycle Parking" -msgstr "Rediger sykkelparkering" - #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Rediger sykkelutleie" @@ -15601,15 +16996,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Rediger sykkelbutikk" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Offentlig transport" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "Internasjonal UIC-jernbanekode" @@ -15617,5 +17012,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Jernbanestopp" @@ -15623,5 +17018,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Rediger jernbanestopp" @@ -15629,5 +17024,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Trikkestopp" @@ -15636,5 +17031,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Rediger trikkestopp" @@ -15642,5 +17037,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Jernbaneplattform" @@ -15649,5 +17044,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Rediger jernbaneplattform" @@ -15659,5 +17054,5 @@ #. #. -#: build/trans_presets.java:1485 build/trans_presets.java:1527 +#: build/trans_presets.java:1497 build/trans_presets.java:1539 msgid "Reference (track number)" msgstr "Spornummer" @@ -15665,10 +17060,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1487 build/trans_presets.java:1529 +#: build/trans_presets.java:1499 build/trans_presets.java:1541 msgid "Area" msgstr "Område" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1489 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "T-baneinngang" @@ -15677,10 +17072,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Rediger T-baneinngang" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Rullestol" @@ -15689,5 +17084,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Busstasjon" @@ -15696,5 +17091,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Rediger busstasjon" @@ -15702,5 +17097,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Bussholdeplass" @@ -15710,5 +17105,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:1515 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Rediger bussholdeplass" @@ -15717,8 +17112,6 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#. item "Amenities/Hunting Stand" label "Edit Hunting Stand" -#. -#: build/trans_presets.java:1520 build/trans_presets.java:1722 -#: build/trans_presets.java:2368 +#: build/trans_presets.java:1532 build/trans_presets.java:1785 +#: build/trans_presets.java:2439 msgid "Shelter" msgstr "Leskur / Ly for natten" @@ -15726,10 +17119,10 @@ #. item "Public Transport/Bus Stop" check "Shelter" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1535 msgid "Bus Platform" msgstr "Bussplatform" #. item -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1536 msgid "Edit Bus Platform" msgstr "Rediger bussplattform" @@ -15737,5 +17130,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Taxi" @@ -15743,5 +17136,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Rediger taxi-stasjon" @@ -15749,5 +17142,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Flyplass" @@ -15755,15 +17148,15 @@ #. item #. -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1553 msgid "Edit Airport" msgstr "Rediger flyplass" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1546 +#: build/trans_presets.java:1558 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -15772,5 +17165,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Overnatting" @@ -15782,5 +17175,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotell" @@ -15789,15 +17182,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Rediger hotell" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Stjerner" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "Motell" @@ -15805,20 +17198,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Rediger motell" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "Gjestehus" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Rediger gjestehus" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "Feriehytter" @@ -15826,10 +17219,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "Rediger feriehytter" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "Ungdomsherberge" @@ -15837,30 +17230,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Rediger ungdomsherberge" #. item "Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1596 msgid "Alpine Hut" msgstr "Fjellstue" #. item -#: build/trans_presets.java:1585 +#: build/trans_presets.java:1597 msgid "Edit Alpine Hut" msgstr "Rediger fjellstue" #. item "Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1602 msgid "Caravan Site" msgstr "Campingvognplass" #. item -#: build/trans_presets.java:1591 +#: build/trans_presets.java:1603 msgid "Edit Caravan Site" msgstr "Rediger campingvognplass" #. item "Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1607 msgid "Camping Site" msgstr "Campingplass" @@ -15868,10 +17261,10 @@ #. item #. -#: build/trans_presets.java:1597 +#: build/trans_presets.java:1609 msgid "Edit Camping Site" msgstr "Rediger campingplass" #. item "Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1602 +#: build/trans_presets.java:1614 msgid "Food+Drinks" msgstr "Mat og drikke" @@ -15882,5 +17275,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -15888,5 +17281,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Rediger restaurant" @@ -15894,5 +17287,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "Cuisine" msgstr "Kjøkken" @@ -15900,61 +17293,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "italian" msgstr "italiensk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "kinesisk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "gatekjøkken" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "gresk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "tysk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "indisk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" msgstr "lokal" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "turkish" msgstr "tyrkisk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "asiatisk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "thai" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "meksikansk" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "japansk" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Gatekjøkken" @@ -15962,9 +17355,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Rediger gatekjøkken" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Kafé" @@ -15972,10 +17365,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Rediger kafé" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "Pub" @@ -15983,20 +17375,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Rediger pub" -#. item "Food+Drinks/Pub" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1645 msgid "Biergarten" msgstr "Biergarten" #. item -#: build/trans_presets.java:1630 +#: build/trans_presets.java:1646 msgid "Edit Biergarten" msgstr "Rediger Biergarten" -#. item "Food+Drinks/Biergarten" text "Name" -#: build/trans_presets.java:1634 +#: build/trans_presets.java:1651 msgid "Bar" msgstr "Bar" @@ -16004,10 +17394,9 @@ #. item #. -#: build/trans_presets.java:1636 +#: build/trans_presets.java:1653 msgid "Edit Bar" msgstr "Rediger bar" -#. item "Food+Drinks/Bar" text "Name" -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1658 msgid "Nightclub" msgstr "Nattklubb" @@ -16015,33 +17404,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Rediger nattklubb" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Turisme" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "Attraksjon" #. item -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1668 msgid "Edit Attraction" msgstr "Rediger attraksjon" -#. item "Tourism/Attraction" text "Name" -#. item "Tourism/Information Office" text "Name" -#. item "Amenities/Baby Hatch" text "Operator" -#: build/trans_presets.java:1652 build/trans_presets.java:1692 -#: build/trans_presets.java:2392 -msgid "Opening Hours" -msgstr "Åpningstider" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Museum" @@ -16049,10 +17429,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Rediger museum" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Zoologisk hage" @@ -16061,10 +17440,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Rediger zoologisk hage" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Utsiktspunkt" @@ -16072,25 +17450,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Rediger utsiktspunkt" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1693 msgid "Look-Out Tower" msgstr "Utsiktstårn" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1674 +#: build/trans_presets.java:1695 msgid "Theme Park" msgstr "Temapark" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Rediger temapark" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "Kunstverk" @@ -16098,5 +17475,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Rediger kunstverk" @@ -16104,86 +17481,211 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1686 +#: build/trans_presets.java:1708 msgid "Information Office" msgstr "Turistinformasjon" -#. item -#. -#: build/trans_presets.java:1688 -msgid "Edit Information Office" -msgstr "Rediger turistinformasjon" - -#. item "Tourism/Information Office" text "Opening Hours" -#: build/trans_presets.java:1694 +#: build/trans_presets.java:1715 msgid "Map" msgstr "Kart" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1698 -msgid "Map Type" -msgstr "Karttype" - -#. item "Tourism/Map" combo "Map Type" -#: build/trans_presets.java:1698 -msgid "map" -msgstr "kart" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "bykart" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "turkart" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "sykkelkart" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "Full stopp" + +#. color tertiary +#. +#. 1 +#. 30000 +#. +#. +#. +#. +#. color deprecated +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. color highway_track +#. +#. 1 +#. 20000 +#. +#. +#. +#. +#. color street +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#: build/trans_presets.java:1720 build/trans_style.java:619 +#: build/trans_style.java:635 build/trans_style.java:651 +#: build/trans_style.java:659 +msgid "street" +msgstr "gate" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "kinesisk" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Last ned område" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Lim inn" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "Storby" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "lokal" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1699 build/trans_presets.java:1706 -#: build/trans_presets.java:1719 +#: build/trans_presets.java:1722 build/trans_presets.java:1738 +#: build/trans_presets.java:1782 msgid "Closer Description" msgstr "Nærmere forklaring" #. item "Tourism/Map" text "Closer Description" -#: build/trans_presets.java:1701 +#. +#. item "Tourism/Guidepost" text "Elevation" +#. +#: build/trans_presets.java:1724 build/trans_presets.java:1747 +msgid "Routes shown for:" +msgstr "" + +#. item "Tourism/Map" check "Hiking" +#. item "Tourism/Guidepost" check "Hiking" +#: build/trans_presets.java:1726 build/trans_presets.java:1749 +#: build/trans_presets.java:1955 +msgid "Cycling" +msgstr "Sykling" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +#, fuzzy +msgid "Mountainbiking" +msgstr "Fjellsti" + +#. item "Tourism/Map" check "Mountainbiking" +#. item "Tourism/Guidepost" check "Mountainbiking" +#: build/trans_presets.java:1728 build/trans_presets.java:1751 +#: build/trans_presets.java:2009 +msgid "Skiing" +msgstr "Ski" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "Sidespor" + +#. item "Tourism/Map" check "Riding" +#. item "Tourism/Guidepost" check "Riding" +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +msgid "... other transportation modes possible" +msgstr "" + +#. item "Tourism/Map" label "... other transportation modes possible" +#: build/trans_presets.java:1732 msgid "Information Board" msgstr "Informasjonstavle" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1705 -msgid "Board Type" -msgstr "Tavletype" - -#. item "Tourism/Information Board" combo "Board Type" -#: build/trans_presets.java:1705 -msgid "board" -msgstr "infotavle" - -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 +#, fuzzy +msgid "Board Content" +msgstr "Tollstasjon" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "begynner" + +#: build/trans_presets.java:1737 msgid "history" msgstr "historisk" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "natur" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "dyreliv" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "bruk av grunn" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" +#: build/trans_presets.java:1740 +#, fuzzy +msgid "Guidepost" msgstr "Veiviser (turvei)" -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#. item "Tourism/Guidepost" label "... other transportation modes possible" +#: build/trans_presets.java:1755 +#, fuzzy +msgid "Information Terminal" +msgstr "Informasjon" + +#. item "Tourism/Information Terminal" text "Name" +#. item "Tourism/Audioguide" text "Name" +#: build/trans_presets.java:1760 build/trans_presets.java:1770 +#, fuzzy +msgid "Closer description" +msgstr "Nærmere forklaring" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Audio" + +#. +#: build/trans_presets.java:1775 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" +#: build/trans_presets.java:1776 +#, fuzzy +msgid "Phone number" +msgstr "Telefonnummer" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1778 msgid "Other Information Points" msgstr "Annen informasjon" #. item -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1786 msgid "Edit Shelter" msgstr "Rediger ly for natten" @@ -16191,25 +17693,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1726 build/trans_presets.java:1732 +#: build/trans_presets.java:1789 build/trans_presets.java:1795 msgid "Fireplace" msgstr "Bålplass" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "Piknik-sted" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Rediger piknik-sted" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Historiske steder" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Slott" @@ -16218,20 +17720,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Rediger slott" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Ruiner" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Rediger ruiner" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Arkeologisk plass" @@ -16240,10 +17741,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Rediger arkeologisk plass" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "Slagmark" @@ -16251,5 +17751,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Rediger slagmark" @@ -16257,15 +17757,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Monument" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Rediger monument" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "Minneplatte" @@ -16273,45 +17773,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Rediger minneplatte" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1773 +#: build/trans_presets.java:1838 msgid "Wayside Cross" msgstr "Kors i veikant" #. item -#: build/trans_presets.java:1774 +#: build/trans_presets.java:1839 msgid "Edit Wayside Cross" msgstr "Rediger kors i veikant" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1778 +#: build/trans_presets.java:1843 msgid "Wayside Shrine" msgstr "Veialter" #. item -#: build/trans_presets.java:1779 +#: build/trans_presets.java:1844 msgid "Edit Wayside Shrine" msgstr "Rediger veialter" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1784 +#: build/trans_presets.java:1849 msgid "Leisure" msgstr "Fritid" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Badepark" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Rediger badepark" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Lekeplass" @@ -16319,15 +17819,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Rediger lekeplass" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Fiskeplass" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Rediger fiskeplass" @@ -16335,15 +17835,15 @@ #. item "Leisure/Fishing" text "Name" #. -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1868 msgid "Sport Facilities" msgstr "Sport" #. group "Sport Facilities" -#: build/trans_presets.java:1804 +#: build/trans_presets.java:1869 msgid "Stadium" msgstr "Stadion" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Rediger stadion" @@ -16357,6 +17857,6 @@ #. item "Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_presets.java:1827 build/trans_presets.java:1836 +#: build/trans_presets.java:1874 build/trans_presets.java:1883 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 msgid "select sport:" msgstr "velg sport:" @@ -16748,30 +18248,30 @@ #. #. -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 build/trans_style.java:3653 -#: build/trans_style.java:3661 build/trans_style.java:3669 -#: build/trans_style.java:3677 build/trans_style.java:3685 -#: build/trans_style.java:3693 build/trans_style.java:3701 -#: build/trans_style.java:3709 build/trans_style.java:3717 -#: build/trans_style.java:3725 build/trans_style.java:3733 -#: build/trans_style.java:3741 build/trans_style.java:3749 -#: build/trans_style.java:3757 build/trans_style.java:3765 -#: build/trans_style.java:3773 build/trans_style.java:3781 -#: build/trans_style.java:3789 build/trans_style.java:3797 -#: build/trans_style.java:3805 build/trans_style.java:3813 -#: build/trans_style.java:3821 build/trans_style.java:3829 -#: build/trans_style.java:3837 build/trans_style.java:3845 -#: build/trans_style.java:3853 build/trans_style.java:3861 -#: build/trans_style.java:3869 build/trans_style.java:3877 -#: build/trans_style.java:3885 build/trans_style.java:3893 -#: build/trans_style.java:3901 build/trans_style.java:3909 -#: build/trans_style.java:3917 build/trans_style.java:3925 -#: build/trans_style.java:3933 build/trans_style.java:3941 -#: build/trans_style.java:3949 build/trans_style.java:3957 -#: build/trans_style.java:3965 build/trans_style.java:3973 -#: build/trans_style.java:3981 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 +#: 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 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 build/trans_style.java:3892 +#: build/trans_style.java:3900 build/trans_style.java:3908 +#: build/trans_style.java:3916 build/trans_style.java:3924 +#: build/trans_style.java:3932 msgid "sport" msgstr "sport" @@ -16781,227 +18281,225 @@ #. item "Sport Facilities/Pitch" combo "sport" #. item "Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "multi" msgstr "flerbruk" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "archery" msgstr "bueskyting" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "athletics" msgstr "turn" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "australian_football" msgstr "australsk fotball" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "baseball" msgstr "baseball" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "basketball" msgstr "basketball" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "boules" msgstr "boules" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "bowls" msgstr "bowls" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "canoe" msgstr "kano" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "climbing" msgstr "klatring" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "cricket" msgstr "cricket" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "cricket_nets" msgstr "cricketnett" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "croquet" msgstr "krocket" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "cycling" msgstr "sykling" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "dog_racing" msgstr "hundeløp" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "equestrian" msgstr "ridning" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "football" msgstr "football" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "gymnastics" msgstr "gymnastikk" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "hockey" msgstr "ishockey" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "horse_racing" msgstr "hesteløp" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "motor" msgstr "motorsport" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "pelota" msgstr "pelota" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "racquet" msgstr "racquet" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "rugby" msgstr "rugby" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "shooting" msgstr "skyting" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "skateboard" msgstr "skateboard" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "skating" msgstr "skøyter" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "skiing" msgstr "ski" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "soccer" msgstr "fotball" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "swimming" msgstr "svømming" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "table_tennis" msgstr "bordtennis" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "tennis" msgstr "tennis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "Sportssenter" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Rediger sportssenter" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1887 msgid "Pitch" msgstr "Bane" #. item -#: build/trans_presets.java:1823 +#: build/trans_presets.java:1888 msgid "Edit Pitch" msgstr "Rediger bane" -#: build/trans_presets.java:1831 +#: build/trans_presets.java:1896 msgid "Racetrack" msgstr "Racerbane" #. item -#: build/trans_presets.java:1832 +#: build/trans_presets.java:1897 msgid "Edit Racetrack" msgstr "Rediger racerbane" -#: build/trans_presets.java:1840 +#: build/trans_presets.java:1905 msgid "Golf Course" msgstr "Golfbane" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Rediger golfbane" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "Minigolf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Rediger minigolf" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1852 +#: build/trans_presets.java:1919 msgid "Multi" msgstr "Flerbruk" #. item -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1920 msgid "Edit Multi" msgstr "Rediger flerbruk" @@ -17040,248 +18538,240 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1856 build/trans_presets.java:1862 -#: build/trans_presets.java:1868 build/trans_presets.java:1874 -#: build/trans_presets.java:1880 build/trans_presets.java:1886 -#: build/trans_presets.java:1892 build/trans_presets.java:1898 -#: build/trans_presets.java:1904 build/trans_presets.java:1910 -#: build/trans_presets.java:1916 build/trans_presets.java:1922 -#: build/trans_presets.java:1928 build/trans_presets.java:1934 -#: build/trans_presets.java:1940 build/trans_presets.java:1949 -#: build/trans_presets.java:1956 build/trans_presets.java:1964 -#: build/trans_presets.java:1970 build/trans_presets.java:1976 -#: build/trans_presets.java:1982 build/trans_presets.java:1988 -#: build/trans_presets.java:1994 build/trans_presets.java:2000 -#: build/trans_presets.java:2006 build/trans_presets.java:2012 -#: build/trans_presets.java:2018 build/trans_presets.java:2024 -#: build/trans_presets.java:2030 build/trans_presets.java:2036 -#: build/trans_presets.java:2042 build/trans_presets.java:2048 -#: build/trans_presets.java:2054 build/trans_presets.java:2060 +#: build/trans_presets.java:1923 build/trans_presets.java:1929 +#: build/trans_presets.java:1935 build/trans_presets.java:1941 +#: build/trans_presets.java:1947 build/trans_presets.java:1953 +#: build/trans_presets.java:1959 build/trans_presets.java:1965 +#: build/trans_presets.java:1971 build/trans_presets.java:1977 +#: build/trans_presets.java:1983 build/trans_presets.java:1989 +#: build/trans_presets.java:1995 build/trans_presets.java:2001 +#: build/trans_presets.java:2007 build/trans_presets.java:2016 +#: build/trans_presets.java:2023 build/trans_presets.java:2031 +#: build/trans_presets.java:2037 build/trans_presets.java:2043 +#: build/trans_presets.java:2049 build/trans_presets.java:2055 +#: build/trans_presets.java:2061 build/trans_presets.java:2067 +#: build/trans_presets.java:2073 build/trans_presets.java:2079 +#: build/trans_presets.java:2085 build/trans_presets.java:2091 +#: build/trans_presets.java:2097 build/trans_presets.java:2103 +#: build/trans_presets.java:2109 build/trans_presets.java:2115 +#: build/trans_presets.java:2121 build/trans_presets.java:2127 msgid "pitch" msgstr "bane" -#: build/trans_presets.java:1856 build/trans_presets.java:1862 -#: build/trans_presets.java:1868 build/trans_presets.java:1874 -#: build/trans_presets.java:1880 build/trans_presets.java:1886 -#: build/trans_presets.java:1892 build/trans_presets.java:1898 -#: build/trans_presets.java:1904 build/trans_presets.java:1910 -#: build/trans_presets.java:1916 build/trans_presets.java:1922 -#: build/trans_presets.java:1928 build/trans_presets.java:1934 -#: build/trans_presets.java:1940 build/trans_presets.java:1949 -#: build/trans_presets.java:1956 build/trans_presets.java:1964 -#: build/trans_presets.java:1970 build/trans_presets.java:1976 -#: build/trans_presets.java:1982 build/trans_presets.java:1988 -#: build/trans_presets.java:1994 build/trans_presets.java:2000 -#: build/trans_presets.java:2006 build/trans_presets.java:2012 -#: build/trans_presets.java:2018 build/trans_presets.java:2024 -#: build/trans_presets.java:2030 build/trans_presets.java:2036 -#: build/trans_presets.java:2042 build/trans_presets.java:2048 -#: build/trans_presets.java:2054 build/trans_presets.java:2060 +#: build/trans_presets.java:1923 build/trans_presets.java:1929 +#: build/trans_presets.java:1935 build/trans_presets.java:1941 +#: build/trans_presets.java:1947 build/trans_presets.java:1953 +#: build/trans_presets.java:1959 build/trans_presets.java:1965 +#: build/trans_presets.java:1971 build/trans_presets.java:1977 +#: build/trans_presets.java:1983 build/trans_presets.java:1989 +#: build/trans_presets.java:1995 build/trans_presets.java:2001 +#: build/trans_presets.java:2007 build/trans_presets.java:2016 +#: build/trans_presets.java:2023 build/trans_presets.java:2031 +#: build/trans_presets.java:2037 build/trans_presets.java:2043 +#: build/trans_presets.java:2049 build/trans_presets.java:2055 +#: build/trans_presets.java:2061 build/trans_presets.java:2067 +#: build/trans_presets.java:2073 build/trans_presets.java:2079 +#: build/trans_presets.java:2085 build/trans_presets.java:2091 +#: build/trans_presets.java:2097 build/trans_presets.java:2103 +#: build/trans_presets.java:2109 build/trans_presets.java:2115 +#: build/trans_presets.java:2121 build/trans_presets.java:2127 msgid "sports_centre" msgstr "sportssenter" -#: build/trans_presets.java:1856 build/trans_presets.java:1862 -#: build/trans_presets.java:1868 build/trans_presets.java:1874 -#: build/trans_presets.java:1880 build/trans_presets.java:1886 -#: build/trans_presets.java:1892 build/trans_presets.java:1898 -#: build/trans_presets.java:1904 build/trans_presets.java:1910 -#: build/trans_presets.java:1916 build/trans_presets.java:1922 -#: build/trans_presets.java:1928 build/trans_presets.java:1934 -#: build/trans_presets.java:1940 build/trans_presets.java:1949 -#: build/trans_presets.java:1956 build/trans_presets.java:1964 -#: build/trans_presets.java:1970 build/trans_presets.java:1976 -#: build/trans_presets.java:1982 build/trans_presets.java:1988 -#: build/trans_presets.java:1994 build/trans_presets.java:2000 -#: build/trans_presets.java:2006 build/trans_presets.java:2012 -#: build/trans_presets.java:2018 build/trans_presets.java:2024 -#: build/trans_presets.java:2030 build/trans_presets.java:2036 -#: build/trans_presets.java:2042 build/trans_presets.java:2048 -#: build/trans_presets.java:2054 build/trans_presets.java:2060 +#: build/trans_presets.java:1923 build/trans_presets.java:1929 +#: build/trans_presets.java:1935 build/trans_presets.java:1941 +#: build/trans_presets.java:1947 build/trans_presets.java:1953 +#: build/trans_presets.java:1959 build/trans_presets.java:1965 +#: build/trans_presets.java:1971 build/trans_presets.java:1977 +#: build/trans_presets.java:1983 build/trans_presets.java:1989 +#: build/trans_presets.java:1995 build/trans_presets.java:2001 +#: build/trans_presets.java:2007 build/trans_presets.java:2016 +#: build/trans_presets.java:2023 build/trans_presets.java:2031 +#: build/trans_presets.java:2037 build/trans_presets.java:2043 +#: build/trans_presets.java:2049 build/trans_presets.java:2055 +#: build/trans_presets.java:2061 build/trans_presets.java:2067 +#: build/trans_presets.java:2073 build/trans_presets.java:2079 +#: build/trans_presets.java:2085 build/trans_presets.java:2091 +#: build/trans_presets.java:2097 build/trans_presets.java:2103 +#: build/trans_presets.java:2109 build/trans_presets.java:2115 +#: build/trans_presets.java:2121 build/trans_presets.java:2127 msgid "stadium" msgstr "stadion" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "bowling" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "Rediger bowling" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1931 msgid "Athletics" msgstr "Turn" #. item -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1932 msgid "Edit Athletics" msgstr "Rediger turn" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1937 msgid "Archery" msgstr "Bueskyting" #. item -#: build/trans_presets.java:1871 +#: build/trans_presets.java:1938 msgid "Edit Archery" msgstr "Rediger bueskyting" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1943 msgid "Climbing" msgstr "Klatring" #. item -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1944 msgid "Edit Climbing" msgstr "Rediger klatring" -#: build/trans_presets.java:1882 +#: build/trans_presets.java:1949 msgid "Canoeing" msgstr "Kano" #. item -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1950 msgid "Edit Canoeing" msgstr "Rediger kano" -#: build/trans_presets.java:1888 -msgid "Cycling" -msgstr "Sykling" - -#. item -#: build/trans_presets.java:1889 +#. item +#: build/trans_presets.java:1956 msgid "Edit Cycling" msgstr "Rediger sykling" -#: build/trans_presets.java:1894 +#: build/trans_presets.java:1961 msgid "Dog Racing" msgstr "Hundeløp" #. item -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1962 msgid "Edit Dog Racing" msgstr "Rediger hundeløp" -#: build/trans_presets.java:1900 +#: build/trans_presets.java:1967 msgid "Equestrian" msgstr "Ridning" #. item -#: build/trans_presets.java:1901 +#: build/trans_presets.java:1968 msgid "Edit Equestrian" msgstr "Rediger ridning" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1973 msgid "Horse Racing" msgstr "Hesteløp" #. item -#: build/trans_presets.java:1907 +#: build/trans_presets.java:1974 msgid "Edit Horse Racing" msgstr "Rediger hesteløp" -#: build/trans_presets.java:1912 +#: build/trans_presets.java:1979 msgid "Gymnastics" msgstr "Gymnastikk" #. item -#: build/trans_presets.java:1913 +#: build/trans_presets.java:1980 msgid "Edit Gymnastics" msgstr "Rediger gymnastikk" -#: build/trans_presets.java:1918 +#: build/trans_presets.java:1985 msgid "Motor Sports" msgstr "Motorsport" #. item -#: build/trans_presets.java:1919 +#: build/trans_presets.java:1986 msgid "Edit Motor Sports" msgstr "Rediger motorsport" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1991 msgid "Skating" msgstr "Skøyter" #. item -#: build/trans_presets.java:1925 +#: build/trans_presets.java:1992 msgid "Edit Skating" msgstr "Rediger skøyter" -#: build/trans_presets.java:1930 +#: build/trans_presets.java:1997 msgid "Skateboard" msgstr "Skateboard" #. item -#: build/trans_presets.java:1931 +#: build/trans_presets.java:1998 msgid "Edit Skateboard" msgstr "Rediger skateboard" -#: build/trans_presets.java:1936 +#: build/trans_presets.java:2003 msgid "Swimming" msgstr "Svømming" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "Rediger svømming" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Ski" - #. item #. -#: build/trans_presets.java:1944 +#: build/trans_presets.java:2011 msgid "Edit Skiing" msgstr "Rediger ski" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "Piste type" msgstr "Løypetype" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "downhill" msgstr "slalom" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "nordic" msgstr "langrenn" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "snow_park" msgstr "snøpark" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "Difficulty" msgstr "Vanskelighetsgrad" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "novice" msgstr "begynner" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "easy" msgstr "enkel" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "intermediate" msgstr "middels" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "advanced" msgstr "vanskelig" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "expert" msgstr "ekspert" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "freeride" msgstr "fristil" -#: build/trans_presets.java:1951 +#: build/trans_presets.java:2018 msgid "Shooting" msgstr "Skyting" @@ -17289,178 +18779,178 @@ #. item #. -#: build/trans_presets.java:1953 +#: build/trans_presets.java:2020 msgid "Edit Shooting" msgstr "Rediger skyting" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:2026 msgid "Sport (Ball)" msgstr "Ballsport" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Fotball" #. item -#: build/trans_presets.java:1961 +#: build/trans_presets.java:2028 msgid "Edit Soccer" msgstr "Rediger fotball" -#: build/trans_presets.java:1966 +#: build/trans_presets.java:2033 msgid "Football" msgstr "Amerikansk fotball" #. item -#: build/trans_presets.java:1967 +#: build/trans_presets.java:2034 msgid "Edit Football" msgstr "Rediger amerikansk fotball" -#: build/trans_presets.java:1972 +#: build/trans_presets.java:2039 msgid "Australian Football" msgstr "Australsk fotball" #. item -#: build/trans_presets.java:1973 +#: build/trans_presets.java:2040 msgid "Edit Australian Football" msgstr "Rediger australsk fotball" -#: build/trans_presets.java:1978 +#: build/trans_presets.java:2045 msgid "Baseball" msgstr "Baseball" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Rediger baseball" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:2051 msgid "Basketball" msgstr "Basketball" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Rediger basketball" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:2057 msgid "Golf" msgstr "Golf" #. item -#: build/trans_presets.java:1991 +#: build/trans_presets.java:2058 msgid "Edit Golf" msgstr "Rediger golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:2061 msgid "golf_course" msgstr "golfbane" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:2063 msgid "Boule" msgstr "Boule" #. item -#: build/trans_presets.java:1997 +#: build/trans_presets.java:2064 msgid "Edit Boule" msgstr "Rediger boule" -#: build/trans_presets.java:2002 +#: build/trans_presets.java:2069 msgid "Bowls" msgstr "Bowls" #. item -#: build/trans_presets.java:2003 +#: build/trans_presets.java:2070 msgid "Edit Bowls" msgstr "Rediger bowls" -#: build/trans_presets.java:2008 +#: build/trans_presets.java:2075 msgid "Cricket" msgstr "Cricket" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Rediger cricket" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:2081 msgid "Cricket Nets" msgstr "Cricketnett" #. item -#: build/trans_presets.java:2015 +#: build/trans_presets.java:2082 msgid "Edit Cricket Nets" msgstr "Rediger cricketnett" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:2087 msgid "Croquet" msgstr "Krocket" #. item -#: build/trans_presets.java:2021 +#: build/trans_presets.java:2088 msgid "Edit Croquet" msgstr "Rediger krocket" -#: build/trans_presets.java:2026 +#: build/trans_presets.java:2093 msgid "Hockey" msgstr "Ishockey" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Rediger ishockey" -#: build/trans_presets.java:2032 +#: build/trans_presets.java:2099 msgid "Pelota" msgstr "Pelota" #. item -#: build/trans_presets.java:2033 +#: build/trans_presets.java:2100 msgid "Edit Pelota" msgstr "Rediger pelota" -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2105 msgid "Racquet" msgstr "Racquet" #. item -#: build/trans_presets.java:2039 +#: build/trans_presets.java:2106 msgid "Edit Racquet" msgstr "Rediger racquet" -#: build/trans_presets.java:2044 +#: build/trans_presets.java:2111 msgid "Rugby" msgstr "Rugby" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Rediger rugby" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:2117 msgid "Table Tennis" msgstr "Bordtennis" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Rediger bordtennis" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Tennis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Rediger tennis" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Bygninger" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Bygning" @@ -17468,5 +18958,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Offentlig bygning" @@ -17474,10 +18964,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Rediger offentlig bygning" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Rådhus" @@ -17485,10 +18975,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Rediger rådhus" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Ambassade" @@ -17496,10 +18986,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Rediger ambassade" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Domstol" @@ -17508,10 +18998,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Rediger domstol" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Fengsel" @@ -17520,10 +19010,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Rediger fengsel" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Politi" @@ -17533,10 +19023,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:2104 +#: build/trans_presets.java:2171 msgid "Edit Police" msgstr "Rediger politi" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Brannstasjon" @@ -17545,10 +19035,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Rediger brannstasjon" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Postkontor" @@ -17556,5 +19046,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Rediger postkontor" @@ -17562,15 +19052,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Barnehage" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Rediger barnehage" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "Skole" @@ -17578,10 +19068,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Rediger skole" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Universitet" @@ -17589,10 +19079,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Rediger universitet" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "Høyskole" @@ -17600,5 +19090,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Rediger høyskole" @@ -17606,5 +19096,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Kino" @@ -17613,10 +19103,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Rediger kino" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Bibliotek" @@ -17625,10 +19115,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Rediger bibliotek" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "Kunstsenter" @@ -17636,10 +19125,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Rediger kunstsenter" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Teater" @@ -17648,10 +19137,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Rediger teater" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Tilbedelsessted" @@ -17661,5 +19150,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:2177 +#: build/trans_presets.java:2245 msgid "Edit Place of Worship" msgstr "Rediger tilbedelsessted" @@ -17668,6 +19157,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "Religion" msgstr "Religion" @@ -17676,66 +19165,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "buddhist" msgstr "buddhist" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "christian" msgstr "kristen" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "jain" msgstr "jain" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "jewish" msgstr "jødisk" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "muslim" msgstr "muslim" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "unitarian" msgstr "unitarisk" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "zoroastrian" msgstr "zoroastrisk" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "Denomination" msgstr "Trosretniing" @@ -17744,81 +19233,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "anglican" msgstr "anglikansk" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "catholic" msgstr "katolsk" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "evangelical" msgstr "evangelisk" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "jehovahs_witness" msgstr "Jehovas vitner" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "lutheran" msgstr "luthersk" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "methodist" msgstr "metodist" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "mormon" msgstr "mormoner" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "orthodox" msgstr "ortodoks" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "pentecostal" msgstr "pinsebevegelsen" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "presbyterian" msgstr "presbyteriansk" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "protestant" msgstr "protestant" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "quaker" msgstr "quaker" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "shia" msgstr "shia" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "sunni" msgstr "sunni" #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2253 msgid "Addresses" msgstr "Adresser" @@ -17827,5 +19316,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Rediger adresseinformasjon" @@ -17833,5 +19322,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Husnummer" @@ -17839,20 +19328,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Husnavn" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "By/sted" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Postnummer" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Landskode" @@ -17860,5 +19349,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Interpoler adresser" @@ -17867,5 +19356,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Rediger interpolasjon" @@ -17873,71 +19362,67 @@ #. item "Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "Numbering scheme" msgstr "Nummereringsmåte" #. item "Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "odd" msgstr "oddetall" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "partall" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "alle" - -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "alphabetic" msgstr "alfabetisk" -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2275 msgid "Man Made" msgstr "Menneskeskapt" #. group "Man Made" -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2276 msgid "Works" msgstr "Fabrikk" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Rediger fabrikk" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Tårn" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Rediger tårn" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Vanntårn" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Rediger vanntårn" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Gassbeholder" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Rediger gassbeholder" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "Fyrtårn" @@ -17945,10 +19430,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Rediger fyrtårn" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Vindmølle" @@ -17956,10 +19441,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Rediger vindmølle" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Rørledning" @@ -17967,10 +19452,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Rediger rørledning" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Kloakkrenseanlegg" @@ -17980,10 +19465,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:2249 +#: build/trans_presets.java:2318 msgid "Edit Wastewater Plant" msgstr "Rediger kloakkrenseanlegg" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Kran" @@ -17991,10 +19476,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Rediger kran" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "Fyrlykt" @@ -18002,10 +19487,10 @@ #. item #. -#: build/trans_presets.java:2261 +#: build/trans_presets.java:2330 msgid "Edit Beacon" msgstr "Rediger fyrlykt" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2265 +#: build/trans_presets.java:2334 msgid "Survey Point" msgstr "Trigonometrisk punkt" @@ -18013,10 +19498,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Rediger trigonometrisk punkt" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "Overvåkingskamera" @@ -18024,5 +19509,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Rediger overvåkingskamera" @@ -18030,5 +19515,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Kraftverk" @@ -18038,39 +19523,39 @@ #. 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:2282 +#: build/trans_presets.java:2351 msgid "Edit Power Generator" msgstr "Rediger kraftverk" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "vind" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "vann" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "atom" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "kull" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "photovoltaic" msgstr "solcelle" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "gas" msgstr "gass" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "Kraftstasjon" @@ -18079,10 +19564,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Rediger kraftstasjon" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Transformatorstasjon" @@ -18091,5 +19576,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Rediger transformatorstasjon" @@ -18097,10 +19582,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2300 build/trans_presets.java:2316 +#: build/trans_presets.java:2369 build/trans_presets.java:2385 msgid "Line reference" msgstr "Linjenummer" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2371 msgid "Power Tower" msgstr "Kraftmast" @@ -18111,5 +19596,5 @@ #. 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:2307 +#: build/trans_presets.java:2376 msgid "Edit Power Tower" msgstr "Rediger kraftmast" @@ -18117,5 +19602,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Kraftlinje" @@ -18124,46 +19609,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Rediger kraftlinje" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Spenning" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Antall ledere" #. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2390 msgid "Amenities" msgstr "Fasiliteter" #. group "Amenities" -#: build/trans_presets.java:2322 +#: build/trans_presets.java:2391 msgid "Toilets" msgstr "Toaletter" -#. item "Amenities/Toilets" text "Operator" -#. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:2327 build/trans_presets.java:2419 -msgid "Reference number" -msgstr "Referansenummer" - #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2329 build/trans_presets.java:2420 +#: build/trans_presets.java:2398 build/trans_presets.java:2511 msgid "Note" msgstr "Kommentar" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2400 msgid "Post Box" msgstr "Postkasse" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Telefon" @@ -18172,5 +19651,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Rediger telefon" @@ -18178,5 +19657,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2342 build/trans_presets.java:2421 +#: build/trans_presets.java:2411 build/trans_presets.java:2512 msgid "Coins" msgstr "Mynter" @@ -18184,5 +19663,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2343 build/trans_presets.java:2422 +#: build/trans_presets.java:2412 build/trans_presets.java:2513 msgid "Notes" msgstr "Sedler" @@ -18190,5 +19669,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2344 build/trans_presets.java:2423 +#: build/trans_presets.java:2413 build/trans_presets.java:2514 msgid "Electronic purses and Charge cards" msgstr "Elektronisk lommebok eller betalingskort" @@ -18196,5 +19675,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2345 build/trans_presets.java:2424 +#: build/trans_presets.java:2414 build/trans_presets.java:2515 msgid "Debit cards" msgstr "Bankkort" @@ -18202,15 +19681,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2346 build/trans_presets.java:2425 +#: build/trans_presets.java:2415 build/trans_presets.java:2516 msgid "Credit cards" msgstr "Kredittkort" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Telefonkort" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Returstasjon" @@ -18219,5 +19698,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Rediger returstasjon" @@ -18225,80 +19704,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Batterier" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Bokser" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Klær" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Glass" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Papir" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Metall" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "Benk" -#. item -#. -#. -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2435 msgid "Hunting Stand" msgstr "Jaktpost" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Rediger jaktpost" -#. item "Amenities/Hunting Stand" check "Shelter" -#: build/trans_presets.java:2369 +#. item "Amenities/Hunting Stand" label "Edit Hunting Stand" +#. +#. item "Land use/Tree" text "Type" +#: build/trans_presets.java:2438 build/trans_presets.java:2899 +msgid "Height" +msgstr "Høyde" + +#. item "Amenities/Hunting Stand" combo "Height" +#: build/trans_presets.java:2438 +msgid "low" +msgstr "lav" + +#: build/trans_presets.java:2438 +msgid "half" +msgstr "halv" + +#: build/trans_presets.java:2438 +msgid "full" +msgstr "full" + +#: build/trans_presets.java:2440 msgid "Hide" msgstr "Skjul" -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2441 msgid "Lock" msgstr "Lås" -#. item "Amenities/Hunting Stand" check "Lock" -#. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2371 build/trans_presets.java:2771 -msgid "Height" -msgstr "Høyde" - -#. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 -msgid "low" -msgstr "lav" - -#: build/trans_presets.java:2371 -msgid "half" -msgstr "halv" - -#: build/trans_presets.java:2371 -msgid "full" -msgstr "full" - -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Fontene" @@ -18307,10 +19782,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Rediger fontene" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Drikkevann" @@ -18319,10 +19794,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Rediger drikkevann" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "Stellebord" @@ -18330,25 +19805,35 @@ #. item #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2459 msgid "Edit Baby Hatch" msgstr "Rediger stellebord" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2465 msgid "Shops" msgstr "Butikker" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "Supermarked" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Rediger supermarked" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +#, fuzzy +msgid "Chemist" +msgstr "Feriehytter" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Rediger feriehytter" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "Minimarked" @@ -18356,10 +19841,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Rediger Minimarked" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "Kiosk" @@ -18367,10 +19851,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Rediger kiosk" -#. item "Shops/Kiosk" text "Name" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2492 +msgid "Book Store" +msgstr "" + +#. item +#: build/trans_presets.java:2493 +#, fuzzy +msgid "Edit Book Store" +msgstr "Rediger bussholdeplass" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Rediger tre" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Automat" @@ -18378,5 +19881,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Rediger automat" @@ -18384,88 +19887,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Automatprodukter" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_tickets" msgstr "billetter" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_plans" msgstr "buss-, trikk- og togkart" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "parking_tickets" msgstr "parkeringsbillett" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "mat" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "drikke" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "sweets" msgstr "godter" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "cigarettes" msgstr "sigaretter" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "foto" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "dyremat" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "aviser" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "leker" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "frimerke" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "SIM-kort" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "telephone_vouchers" msgstr "telefonkort" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "vouchers" msgstr "sedler" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "condoms" msgstr "kondomer" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "tamponger" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "excrement_bags" msgstr "hundeposer" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2517 msgid "Account or loyalty cards" msgstr "kundekort" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2519 msgid "Butcher" msgstr "Slakter" @@ -18473,10 +19976,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Rediger slakter" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Baker" @@ -18484,10 +19986,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Rediger baker" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "Blomster" @@ -18495,20 +19996,18 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Rediger blomster" -#. item "Shops/Florist" text "Name" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2540 msgid "Organic" msgstr "Økologisk" #. item -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2541 msgid "Edit Organic Shop" msgstr "Rediger økologisk" -#. item "Shops/Organic" text "Name" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2546 msgid "Alcohol" msgstr "Sprit og vin" @@ -18516,60 +20015,54 @@ #. item #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2548 msgid "Edit Alcohol Shop" msgstr "Rediger sprit og vin" -#. item "Shops/Alcohol" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2553 msgid "Beverages" msgstr "Drikke" #. item -#: build/trans_presets.java:2458 +#: build/trans_presets.java:2554 msgid "Edit Beverages Shop" msgstr "Rediger drikke" -#. item "Shops/Beverages" text "Name" -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2559 msgid "Computer" msgstr "Dataelektronikk" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Rediger dataelektronikk" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "Elektronikk" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Rediger elektronikk" -#. item "Shops/Electronics" text "Name" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2571 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Rediger hifi" -#. item "Shops/Hifi" text "Name" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2577 msgid "Furniture" msgstr "Møbler" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Rediger møbler" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "Hagesenter" @@ -18577,10 +20070,9 @@ #. item #. -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2585 msgid "Edit Garden Centre" msgstr "Rediger hagesenter" -#. item "Shops/Garden Centre" text "Name" -#: build/trans_presets.java:2488 +#: build/trans_presets.java:2590 msgid "Hardware" msgstr "Jernvarehandel" @@ -18588,10 +20080,9 @@ #. item #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2592 msgid "Edit Hardware Store" msgstr "Rediger jernvarehandel" -#. item "Shops/Hardware" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2597 msgid "Do-it-yourself-store" msgstr "Byggevare" @@ -18599,60 +20090,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "Rediger byggevare" -#. item "Shops/Do-it-yourself-store" text "Name" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2604 msgid "Stationery" msgstr "Kontor" #. item -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2605 msgid "Edit Stationery Shop" msgstr "Rediger kontor" -#. item "Shops/Stationery" text "Name" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2610 msgid "Hairdresser" msgstr "Frisør" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Rediger frisør" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "Sko" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Rediger sko" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "Leker" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Rediger leker" -#. item "Shops/Toys" text "Name" -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2628 msgid "Video" msgstr "Video" #. item -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2629 msgid "Edit Video Shop" msgstr "Rediger video" -#. item "Shops/Video" text "Name" -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2634 msgid "Dry Cleaning" msgstr "Renseri" @@ -18660,10 +20145,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Rediger renseri" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Vaskeri" @@ -18671,10 +20155,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Rediger vaskeri" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "Friluftsutstyr" @@ -18682,35 +20165,32 @@ #. item #. -#: build/trans_presets.java:2539 +#: build/trans_presets.java:2650 msgid "Edit Outdoor Shop" msgstr "Rediger friluftsutstyr" -#. item "Shops/Outdoor" text "Name" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2655 msgid "Sports" msgstr "Sport" #. item -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2656 msgid "Edit Sports Shop" msgstr "Rediger sport" -#. item "Shops/Sports" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2661 msgid "Optician" msgstr "Optiker" #. item -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2662 msgid "Edit Optician" msgstr "Rediger optiker" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Valuta" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Bank" @@ -18718,16 +20198,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Rediger bank" -#. item "Cash/Bank" text "Name" -#. item "Cash/Money Exchange" text "Name" -#: build/trans_presets.java:2561 build/trans_presets.java:2569 +#: build/trans_presets.java:2677 build/trans_presets.java:2686 msgid "Automated Teller Machine" msgstr "Minibank" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Veksle valuta" @@ -18735,5 +20213,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Rediger valutaveksling" @@ -18741,15 +20219,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Rediger minibank" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Helse" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Lege" @@ -18757,20 +20235,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Rediger lege" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Tannlege" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Rediger tannlege" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Apotek" @@ -18778,5 +20254,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Rediger apotek" @@ -18784,10 +20260,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2711 msgid "Dispensing" msgstr "Reseptlevering" -#. item "Health/Pharmacy" text "Name" -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2715 msgid "Hospital" msgstr "Sykehus" @@ -18795,10 +20270,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Rediger sykehus" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "Redningsmøtepunkt" @@ -18807,5 +20282,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "Rediger redningsmøtepunkt" @@ -18814,20 +20289,20 @@ #. #. -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2727 msgid "Point Number" msgstr "Punktnummer" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2728 msgid "Point Name" msgstr "Navn på punkt" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2730 msgid "Phone Number" msgstr "Telefonnummer" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2731 msgid "(Use international code, like +12-345-67890)" msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)" @@ -18835,5 +20310,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2614 +#: build/trans_presets.java:2734 msgid "Veterinary" msgstr "Veterinær" @@ -18842,55 +20317,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Rediger veterinær" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Kontinent" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Rediger kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Land" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Rediger land" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "Delstat/provins" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Rediger delstat/provins" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Region" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Rediger region (fylke)" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "Kommune" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "Rediger kommune" @@ -18898,15 +20373,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Storby" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Rediger storby" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "By" @@ -18914,10 +20389,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Rediger by" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Forstad/bydel" @@ -18925,25 +20400,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Rediger forstad/bydel" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Landsby" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Rediger landsby" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Grend" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Rediger grend" @@ -18951,5 +20426,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "Lokalitet" @@ -18957,10 +20432,10 @@ #. item #. -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2811 msgid "Edit Locality" msgstr "Rediger lokalitet" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2816 msgid "Island" msgstr "Øy" @@ -18968,11 +20443,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Rediger øy" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "venstre" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Rediger feriehytter" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Huleinngang" @@ -18980,10 +20468,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Rediger huleinngang" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Fjelltopp" @@ -18991,10 +20479,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Rediger fjelltopp" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Isbre" @@ -19002,10 +20490,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Rediger isbre" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Vulkan" @@ -19013,70 +20501,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Rediger vulkan" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Grenser" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "Nasjonal" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Rediger landegrense" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "Fylkesgrense" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Rediger fylkesgrense" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2872 msgid "Civil" msgstr "Kommunegrense" #. item -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2873 msgid "Edit Civil Boundary" msgstr "Rediger kommunegrense" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2750 +#: build/trans_presets.java:2878 msgid "Political" msgstr "Politisk" #. item -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2879 msgid "Edit Political Boundary" msgstr "Rediger politisk grense" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2756 +#: build/trans_presets.java:2884 msgid "National park" msgstr "Nasjonalpark" #. item -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2885 msgid "Edit National Park Boundary" msgstr "Rediger nasjonalparkgrense" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Bruk av grunn" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Tre" @@ -19085,15 +20573,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Rediger tre" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Botanisk navn" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Skogsområde" @@ -19102,5 +20590,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Rediger skogsområde" @@ -19108,17 +20596,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "coniferous" msgstr "barskog" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "løvskog" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "blandingsskog" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Skog" @@ -19127,14 +20615,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Rediger skog" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "Naturreservat" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Rediger naturreservat" @@ -19142,25 +20630,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "Steinur" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Rediger steinur" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "Krattskog" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Rediger krattskog" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "Fjell" @@ -19168,10 +20656,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "Rediger fjell" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "Beite" @@ -19179,5 +20667,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Rediger beite" @@ -19185,5 +20673,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Gårdstun" @@ -19192,45 +20680,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Rediger gårdstun" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2956 msgid "Farmland" msgstr "Åkerland" #. item -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2957 msgid "Edit Farmland Landuse" msgstr "Rediger åkerland" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2962 msgid "Meadow" msgstr "Eng" #. item -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2963 msgid "Edit Meadow Landuse" msgstr "Rediger eng" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2968 msgid "Vineyard" msgstr "Vingård" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Rediger vingård" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "Hageparseller" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "Rediger hageparseller" @@ -19238,25 +20726,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Hage" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Rediger hage" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2986 msgid "Grass" msgstr "Gress" #. item -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2987 msgid "Edit Grass Landuse" msgstr "Rediger gress" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2864 +#: build/trans_presets.java:2992 msgid "Village Green" msgstr "Friområde" @@ -19264,10 +20752,10 @@ #. item #. -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2994 msgid "Edit Village Green Landuse" msgstr "Rediger friområde" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2871 +#: build/trans_presets.java:2999 msgid "Common" msgstr "Offentlig" @@ -19275,20 +20763,20 @@ #. item #. -#: build/trans_presets.java:2873 +#: build/trans_presets.java:3001 msgid "Edit Common" msgstr "Rediger offentlig" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:2877 +#: build/trans_presets.java:3005 msgid "Park" msgstr "Park" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Rediger park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "Friluftsområde" @@ -19296,5 +20784,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Rediger friluftsområde" @@ -19302,15 +20790,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Boligområde" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Rediger boligområde" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "Gravlund" @@ -19318,9 +20806,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Rediger gravlund" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Kirkegård" @@ -19328,39 +20816,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Rediger kirkegård" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Forretninger" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Rediger forretninger" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "Næringsområde" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Rediger næringsområde" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "Industriområde" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Rediger industriområde" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "Jernbanegrunn" @@ -19368,15 +20856,15 @@ #. item #. -#: build/trans_presets.java:2933 +#: build/trans_presets.java:3061 msgid "Edit Railway Landuse" msgstr "Rediger jernbanegrunn" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:2938 +#: build/trans_presets.java:3066 msgid "Military" msgstr "Millitært" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Rediger millitært" @@ -19384,55 +20872,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Byggeplass" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Rediger byggeplass" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:2951 +#: build/trans_presets.java:3079 msgid "Brownfield" msgstr "Rivningsområde" #. item -#: build/trans_presets.java:2952 +#: build/trans_presets.java:3080 msgid "Edit Brownfield Landuse" msgstr "Rediger rivningsområde" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:2957 +#: build/trans_presets.java:3085 msgid "Greenfield" msgstr "Byggeområde" #. item -#: build/trans_presets.java:2958 +#: build/trans_presets.java:3086 msgid "Edit Greenfield Landuse" msgstr "Rediger byggeområde" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:2963 +#: build/trans_presets.java:3091 msgid "Landfill" msgstr "Avfallsdeponi" #. item -#: build/trans_presets.java:2964 +#: build/trans_presets.java:3092 msgid "Edit Landfill Landuse" msgstr "Rediger avfallsdeponi" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:3097 msgid "Quarry" msgstr "Steinbrudd" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Rediger steinbrudd" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "Multipolygon" @@ -19442,5 +20930,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:2983 +#: build/trans_presets.java:3111 msgid "Edit Multipolygon" msgstr "Rediger multipolygon" @@ -19449,10 +20937,10 @@ #. #. -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3117 msgid "outer segment" msgstr "ytre linjesegment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3118 msgid "inner segment" msgstr "indre linjesegment" @@ -19460,5 +20948,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "Svingeforbud" @@ -19467,5 +20955,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "Rediger svingeforbud" @@ -19473,34 +20961,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "Restriction" msgstr "Forbud" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_left_turn" msgstr "venstresving forbudt" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_right_turn" msgstr "høyresving forbudt" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_straight_on" msgstr "rett frem forbudt" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_u_turn" msgstr "u-sving forbudt" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_right_turn" msgstr "påbudt høyresving" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_left_turn" msgstr "påbudt venstresving" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_straight_on" msgstr "påbudt rett frem" @@ -19509,15 +20997,15 @@ #. #. -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3131 msgid "from way" msgstr "fra linje" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3004 +#: build/trans_presets.java:3132 msgid "via node or way" msgstr "via node eller linje" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3133 msgid "to way" msgstr "til linje" @@ -19525,5 +21013,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "Rute" @@ -19532,5 +21020,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "Rediger rute" @@ -19538,5 +21026,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "Rutetype" @@ -19608,5 +21096,5 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:233 +#: build/trans_presets.java:3141 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -19615,17 +21103,17 @@ msgstr "sykkel" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "bus" msgstr "buss" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "road" msgstr "vei" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ferry" msgstr "ferge" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ski" msgstr "ski" @@ -19678,5 +21166,5 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:247 +#: build/trans_presets.java:3141 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -19685,13 +21173,13 @@ msgstr "fotgjenger" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "hiking" msgstr "tur" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "tram" msgstr "trikk" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "detour" msgstr "omkjøring" @@ -19705,10 +21193,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "T-bane" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "Symbolforklaring" @@ -19716,31 +21204,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3147 msgid "Network" msgstr "Nettverk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "proposed" msgstr "planlagt" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "alternate" msgstr "alternativ" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "temporary" msgstr "midlertidig" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "connection" msgstr "forbindelse" -#: build/trans_presets.java:3022 +#: build/trans_presets.java:3150 msgid "Color (hex)" msgstr "Farge (hex)" @@ -19749,30 +21237,30 @@ #. #. -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3153 msgid "route segment" msgstr "rutesegment" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3154 msgid "forward segment" msgstr "neste segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3155 msgid "backward segment" msgstr "forrige segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3028 +#: build/trans_presets.java:3156 msgid "halt point" msgstr "stoppepunkt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3029 +#: build/trans_presets.java:3157 msgid "forward halt point" msgstr "neste stoppunkt" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3030 +#: build/trans_presets.java:3158 msgid "backward halt point" msgstr "forrige stoppunkt" @@ -20210,11 +21698,11 @@ #: build/trans_style.java:627 build/trans_style.java:824 #: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3424 build/trans_style.java:3425 -#: build/trans_style.java:3995 build/trans_style.java:4295 -#: build/trans_style.java:4304 build/trans_style.java:4313 -#: build/trans_style.java:4322 build/trans_style.java:4331 -#: build/trans_style.java:4340 build/trans_style.java:4349 -#: build/trans_style.java:4350 build/trans_style.java:4359 -#: build/trans_style.java:4368 +#: build/trans_style.java:3375 build/trans_style.java:3376 +#: build/trans_style.java:3946 build/trans_style.java:4254 +#: build/trans_style.java:4263 build/trans_style.java:4272 +#: build/trans_style.java:4281 build/trans_style.java:4290 +#: build/trans_style.java:4299 build/trans_style.java:4308 +#: build/trans_style.java:4309 build/trans_style.java:4318 +#: build/trans_style.java:4327 msgid "deprecated" msgstr "uønsket" @@ -20540,41 +22028,4 @@ msgid "motorroad" msgstr "" - -#. color tertiary -#. -#. 1 -#. 30000 -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. color highway_track -#. -#. 1 -#. 20000 -#. -#. -#. -#. -#. color street -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#: build/trans_style.java:619 build/trans_style.java:635 -#: build/trans_style.java:651 build/trans_style.java:659 -msgid "street" -msgstr "gate" #. color street @@ -22275,5 +23726,5 @@ #. #: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3343 +#: build/trans_style.java:3294 msgid "light_water" msgstr "light_vann" @@ -22872,55 +24323,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -22934,5 +24336,5 @@ #: build/trans_style.java:2925 build/trans_style.java:2933 #: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:3029 +#: build/trans_style.java:2958 build/trans_style.java:2980 msgid "tourism" msgstr "turisme" @@ -23004,8 +24406,8 @@ #. #. -#: build/trans_style.java:3039 build/trans_style.java:3047 -#: build/trans_style.java:3055 build/trans_style.java:3063 -#: build/trans_style.java:3071 build/trans_style.java:3079 -#: build/trans_style.java:3087 build/trans_style.java:3095 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 +#: build/trans_style.java:3022 build/trans_style.java:3030 +#: build/trans_style.java:3038 build/trans_style.java:3046 msgid "historic" msgstr "historisk" @@ -23076,8 +24478,8 @@ #. #. -#: build/trans_style.java:3104 build/trans_style.java:3112 -#: build/trans_style.java:3120 build/trans_style.java:3128 -#: build/trans_style.java:3176 build/trans_style.java:3184 -#: build/trans_style.java:3282 build/trans_style.java:3290 +#: build/trans_style.java:3055 build/trans_style.java:3063 +#: build/trans_style.java:3071 build/trans_style.java:3079 +#: build/trans_style.java:3127 build/trans_style.java:3135 +#: build/trans_style.java:3233 build/trans_style.java:3241 msgid "green" msgstr "grønn" @@ -23091,5 +24493,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "steinbrudd" @@ -23103,5 +24505,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "avfallsdeponi" @@ -23123,5 +24525,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "vannmagasin" @@ -23135,5 +24537,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "skog" @@ -23147,5 +24549,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "gårdstun" @@ -23168,5 +24570,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "butikker" @@ -23180,5 +24582,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "industri" @@ -23192,5 +24594,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "rivningsområde" @@ -23204,5 +24606,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "byggeområde" @@ -23216,5 +24618,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "jernbanegrunn" @@ -23271,7 +24673,7 @@ #. #. -#: build/trans_style.java:3266 build/trans_style.java:3301 -#: build/trans_style.java:3309 build/trans_style.java:3317 -#: build/trans_style.java:3325 build/trans_style.java:3333 +#: build/trans_style.java:3217 build/trans_style.java:3252 +#: build/trans_style.java:3260 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3284 msgid "military" msgstr "millitært" @@ -23285,5 +24687,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "gravlund" @@ -23296,5 +24698,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "fjelltopp" @@ -23309,5 +24711,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "isbre" @@ -23321,5 +24723,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "vulkan" @@ -23374,8 +24776,8 @@ #. #. -#: build/trans_style.java:3375 build/trans_style.java:3376 -#: build/trans_style.java:3384 build/trans_style.java:3400 -#: build/trans_style.java:3473 build/trans_style.java:3481 -#: build/trans_style.java:3489 +#: build/trans_style.java:3326 build/trans_style.java:3327 +#: build/trans_style.java:3335 build/trans_style.java:3351 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 msgid "natural" msgstr "natur" @@ -23389,5 +24791,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "krattskog" @@ -23401,20 +24803,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "beiteområde" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "skogsområde" - #. color water #. 1 @@ -23425,5 +24815,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "søle" @@ -23437,5 +24827,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "strand" @@ -23513,8 +24903,8 @@ #. #. -#: build/trans_style.java:3505 build/trans_style.java:3513 -#: build/trans_style.java:3521 build/trans_style.java:3529 -#: build/trans_style.java:3537 build/trans_style.java:3545 -#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 +#: build/trans_style.java:3488 build/trans_style.java:3496 +#: build/trans_style.java:3504 build/trans_style.java:3512 msgid "route" msgstr "rute" @@ -23562,7 +24952,7 @@ #. #. -#: build/trans_style.java:3571 build/trans_style.java:3579 -#: build/trans_style.java:3587 build/trans_style.java:3595 -#: build/trans_style.java:3603 +#: build/trans_style.java:3522 build/trans_style.java:3530 +#: build/trans_style.java:3538 build/trans_style.java:3546 +#: build/trans_style.java:3554 msgid "boundary" msgstr "grense" @@ -23704,10 +25094,19 @@ #. #. -#: build/trans_style.java:4043 build/trans_style.java:4051 -#: build/trans_style.java:4059 build/trans_style.java:4067 -#: build/trans_style.java:4075 build/trans_style.java:4083 -#: build/trans_style.java:4091 build/trans_style.java:4099 -#: build/trans_style.java:4107 build/trans_style.java:4115 -#: build/trans_style.java:4123 build/trans_style.java:4131 +#. color place +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: 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_style.java:4050 +#: build/trans_style.java:4058 build/trans_style.java:4066 +#: build/trans_style.java:4074 build/trans_style.java:4082 +#: build/trans_style.java:4090 msgid "place" msgstr "sted" @@ -23755,6 +25154,6 @@ #. #. -#: build/trans_style.java:4248 build/trans_style.java:4255 -#: build/trans_style.java:4262 build/trans_style.java:4269 +#: build/trans_style.java:4207 build/trans_style.java:4214 +#: build/trans_style.java:4221 build/trans_style.java:4228 msgid "address" msgstr "adresse" @@ -24051,9 +25450,88 @@ msgstr "Terraserver Urban" -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Velg Tableau d'Assemblage" - -#~ msgid "Adjust the position of the WMS layer (raster images only)" -#~ msgstr "Juster posisjonen på WMS-laget (kun rasterbilder)" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Tips: Noen endringer kom fra å laste opp nye data til tjeneren." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Velg linjer med tilnærmet vinkelrette knekk for vinkling." + +#~ msgid "" +#~ "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." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Ingen åpne dokument å lagre" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Slett {1} {0}" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Fjern relasjonsmedlem {0} {1}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Kan ikke åpne innstillingsmappe: {0}" + +#~ msgid "nodes" +#~ msgstr "noder" + +#~ msgid "ways" +#~ msgstr "linjer" + +#~ msgid "relations" +#~ msgstr "relasjoner" + +#~ msgid "changesets" +#~ msgstr "endringssett" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "Klarte ikke laste historikk fra tjeneren. Detaljer:
{0}" + +#~ msgid "Delete Layer" +#~ msgstr "Slett Lag" + +#~ msgid "Authors: {0}" +#~ msgstr "Opphavsmenn: {0}" + +#~ msgid "Public" +#~ msgstr "Offentlig" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "" +#~ "Dette medfører at din sporlogg blir offentlig tilgjengelig på " +#~ "openstreetmap.org" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "DETTE ER PÅ FORØKSTADIET. Lagre arbeidet og bekreft før opplasting." + +#~ msgid "Continue anyway" +#~ msgstr "Fortsett uansett" + +#~ msgid "Edit Information Office" +#~ msgstr "Rediger turistinformasjon" + +#~ msgid "Map Type" +#~ msgstr "Karttype" + +#~ msgid "map" +#~ msgstr "kart" + +#~ msgid "citymap" +#~ msgstr "bykart" + +#~ msgid "hikingmap" +#~ msgstr "turkart" + +#~ msgid "bicyclemap" +#~ msgstr "sykkelkart" + +#~ msgid "Board Type" +#~ msgstr "Tavletype" + +#~ msgid "board" +#~ msgstr "infotavle" #~ msgid "Move" @@ -24164,7 +25642,4 @@ #~ msgid "Conflicts: {0}" #~ msgstr "Konflikter: {0}" - -#~ msgid "Not implemented yet." -#~ msgstr "Ikke implementert enda." #~ msgid "Layers: {0}" @@ -24309,4 +25784,7 @@ #~ msgid "Invalid projection" #~ msgstr "Ugyldig kartprojeksjon" + +#~ msgid "Select Tableau d'Assemblage" +#~ msgstr "Velg Tableau d'Assemblage" #~ msgid "Adjust the position of the WMS layer" @@ -24448,7 +25926,4 @@ #~ msgstr "Mangler objekt" -#~ msgid "image loading..." -#~ msgstr "laster bilde …" - #~ msgid "Aborting..." #~ msgstr "Avbryter …" @@ -24516,4 +25991,7 @@ #~ msgstr "Bruk ufullstendige løsninger" +#~ msgid "Adjust the position of the WMS layer (raster images only)" +#~ msgstr "Juster posisjonen på WMS-laget (kun rasterbilder)" + #~ msgid "Layer {0} must be in list of layers" #~ msgstr "Lag {0} må være i listen over lag"