Index: applications/editors/josm/i18n/po/nb.po =================================================================== --- applications/editors/josm/i18n/po/nb.po (revision 18656) +++ applications/editors/josm/i18n/po/nb.po (revision 18773) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-09 01:48+0000\n" -"Last-Translator: Skippern \n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-17 17:59+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Norwegian Bokmal \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Hjelp" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, 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:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../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:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../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/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,12 +92,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Advarsel" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Overser feilutformet fil-URL: «{0}»" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Kunne ikke lese fil ''{0}''.
Feilen er:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -107,17 +114,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Kunne ikke lese fil ''{0}''.
Feilen er:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -125,8 +123,8 @@ #: ../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:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -136,21 +134,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../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/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -174,8 +172,11 @@ #: ../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:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -188,6 +189,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Feil" @@ -208,6 +209,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -302,5 +303,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -309,27 +310,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -347,5 +348,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Avbryt" @@ -355,19 +356,19 @@ msgstr "Velg minst én allerede opplastet node, linje eller relasjon." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 +msgid "Select target layer" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -msgid "Select target layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Flett" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -376,5 +377,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "" @@ -487,13 +488,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -591,20 +592,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Fil: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -642,10 +643,10 @@ msgstr "Kan ikke sammenføye linjer. (Kan ikke bli sammenhengende nodestreng)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Sammenføy {0} linjer" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Velg minst to linjer å sammenføye." @@ -691,10 +692,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -713,11 +714,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Skriv over" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Filen finnes. Vil du overskrive filen?" @@ -764,5 +765,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -771,6 +772,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -786,7 +787,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../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:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -814,5 +814,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Fordoble" @@ -836,30 +836,30 @@ msgstr "Avslutt programmet." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Alle formater" +#: ../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:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 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:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 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/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -867,13 +867,13 @@ #: ../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/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../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/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -892,8 +892,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -901,7 +901,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -924,9 +924,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -938,5 +938,5 @@ msgstr "parameter «{0}» må ha en verdi" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -944,5 +944,5 @@ 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" @@ -1088,6 +1088,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Ny" @@ -1216,5 +1216,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Lim inn" @@ -1302,11 +1302,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Lagre" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Lagre gjeldende data." @@ -1363,10 +1363,10 @@ #: ../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:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Lagre som …" #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Lagre aktive data i ny fil." @@ -1384,29 +1384,29 @@ "Velg alle data i lag som ikke er slettet. OBS uferdige data blir også valgt." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Vis statusrapport" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "Vis statusrapport med informasjon for feilsøking" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Hjelp: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Statusrapport" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Kopier til utklippstavlen og lukk" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1564,5 +1564,5 @@ msgstr "Node uten tilknytning" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1570,5 +1570,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1615,55 +1615,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Oppdater utvalg" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Oppdater utvalg" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Det er ingen valgte objekter å oppdatere" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Utvalget er tomt" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Oppdater utvalg" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "Last opp data" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1672,5 +1669,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1678,29 +1675,29 @@ msgstr "Ingen endringer å laste opp." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 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:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" +msgid "Synchronize way {0} only" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format msgid "Synchronize relation {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Synkroniser hele datasettet" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1721,11 +1718,11 @@ "strong> for å gå tilbake og fortsette å redigere.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "Konflikter avdekkeet" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1740,5 +1737,5 @@ "strong> for å avbryte operasjonen og fortsette å redigere.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1748,22 +1745,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 msgid "Prepare conflict resolution" msgstr "Forbereder konfliktløsing" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1774,19 +1771,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "Oppdaterer objekt" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1795,5 +1792,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1802,15 +1799,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1922,17 +1919,17 @@ msgstr "Spill av sakte" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Laster ned GPS-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Laster ned GPX-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Laster ned data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1940,5 +1937,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "Ingen data funnet i dette området" @@ -1997,9 +1994,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Feil under nedlasting" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -2017,5 +2014,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2023,5 +2020,5 @@ msgstr "Modus: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2118,7 +2115,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." -msgstr "Trekk ut et fritt valgt rektangel og slipp museknappen." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2127,9 +2123,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Dra et linjesegment for å lage et rektangel." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2143,5 +2138,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2161,17 +2156,17 @@ msgstr[1] "Legg til og flytt en kunstig node til {0} linjer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "Flytt elementer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Flytt dem" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Angre flytting" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2181,13 +2176,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Slipp museknappen for å velge objektene i rektangelet." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2196,9 +2191,9 @@ "nærmeste node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Slipp museknappen for å avslutte rotasjon." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2209,15 +2204,15 @@ "Shift-Ctrl for å rotere utvalget; eller endre utvalg" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Forstørr" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Skaler og flytt kart" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2227,10 +2222,10 @@ "piltaster; flytt utsnitt med høyre museknapp" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Søk …" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2239,58 +2234,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Skriv inn søketekst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "regulært uttrykk" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "erstatt utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "legg til i utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "fjern fra utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "skill mellom store/små bokstaver" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "regulært uttrykk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Nansens gate – «Nansens» og «gate» i nøkkel eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Nansens gate\" – «Nansens gate» i nøkkel eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Nan – «Nan» finnes innen navnet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route – nøkkel «type» med eksakt verdi «route»." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2300,34 +2294,34 @@ "*=value, type=, *=*, *=." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Nan – «Nan» finnes ikke innen navnet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: – nøkkel «foot» med hvilken som helst verdi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "Spesialsøk:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "" "type: - type of the object (node, way, relation)" msgstr "type: – type objekt (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 msgid "user:... - all objects changed by user" msgstr "user:… – alle objekter redigert av angitt bruker" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +msgid "id:... - object with given ID (0 for new objects)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 -msgid "id:... - object with given ID (0 for new objects)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "nodes:... - object with given number of nodes" msgstr "nodes:… – objekt med angitt antall noder" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2335,37 +2329,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified – alle endrede objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected – alle objekter i utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete – alle uferdige objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "untagged – alle objekter uten egenskaper" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +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:134 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:135 -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:136 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:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2373,9 +2367,9 @@ "«:»)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use ( and ) to group expressions" msgstr "Bruk ( og ) for å gruppere uttrykk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2385,51 +2379,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Søk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Start søk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "Fant ingen treff for «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, 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:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, 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:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "Fant {0} treff" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2446,41 +2440,41 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" "Nøkkel kan ikke være tom når egenskap-operatoren brukes. Bruk: nøkkel=verdi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "Ukjent objekttype: {0}. Tillatte verdier er node, way og relation" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "Uventet symbol: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "OR mangler argument." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "NOT mangler argument." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Forventer parentes slutt." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2489,9 +2483,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "Feil antall parametere for nodes-operator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2502,5 +2496,5 @@ "intervall, for eksempel nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2603,7 +2597,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2713,5 +2707,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "" @@ -2736,5 +2730,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2742,6 +2736,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "kan ikke løse uavgjort konflikt" @@ -2811,18 +2805,8 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" msgstr "Løs slettekonflikt i {0}" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" -msgstr "" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 @@ -2857,10 +2841,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "Løs medlemskonflikter i relasjon {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2895,20 +2879,20 @@ msgstr "Sekvens" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2930,10 +2914,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -2977,5 +2961,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Ny verdi" @@ -3022,7 +3006,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "Parameter «{0}» > 0 forventet – leste «{1}»." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3031,10 +3015,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "Innstillingsfil har feil i linje {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3043,5 +3027,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3050,5 +3034,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3057,5 +3041,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3064,5 +3048,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3070,5 +3054,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3077,5 +3061,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3084,5 +3068,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3091,5 +3075,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3098,10 +3082,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3182,25 +3166,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "V" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "Ø" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3208,5 +3192,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3214,5 +3198,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3222,26 +3206,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "NOT mangler argument." - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3250,6 +3234,6 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 +#, java-format msgid "" "Target object with id {0} and version {1} is visible although source object " @@ -3257,7 +3241,4 @@ "Keeping target object. " 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. " #. translators notes must be in front @@ -3314,24 +3295,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3339,5 +3320,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3365,10 +3346,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3379,7 +3360,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "Parameter «{0}» > 0 forventet – leste «{1}»." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3398,7 +3379,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114 -#, fuzzy, java-format +#, java-format 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}»" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -3533,10 +3514,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Feil: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3548,6 +3529,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3557,5 +3538,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3565,6 +3546,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3582,6 +3563,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "bakgrunn" @@ -3599,24 +3580,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"VIKTIG: data ligger langt unna\n" -"grensene for den aktive Lambert-sonen.\n" -"Ikke last opp data etter denne beskjeden.\n" -"Angre siste handling, lagre arbeidet\n" -"og start et nytt lag i en annen sone." - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "Lambert sone" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3630,26 +3623,52 @@ msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +#, fuzzy +msgid "PUWG Zone" +msgstr "Sone" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "Swiss Grid (Sveits)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" msgstr "" @@ -3664,10 +3683,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Ikke vis igjen" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3675,32 +3694,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../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:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "ferdselsvei" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "jernbane" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "vannvei" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "bruk av grunn" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3709,5 +3728,5 @@ msgstr[1] "{0} noder" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3745,6 +3764,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Konflikt" @@ -3754,11 +3773,11 @@ msgstr "Ukjent vert" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3962,11 +3981,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../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:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4081,5 +4100,5 @@ msgstr "Lengden på segmentet som tegnes." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4087,18 +4106,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(intet objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "Laget er ikke i lista." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4220,50 +4239,50 @@ msgstr "rolle {0} deltar ikke i sammenlikningspar {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "Egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Noder" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "Ingen gjenværende egenskapskonflikter å løse" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 #, java-format msgid "Tags({0} conflicts)" msgstr "Egenskaper ({0} konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} gjenværende egenskapskonflikter å løse" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 msgid "Nodes(resolved)" msgstr "Noder (løst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4272,17 +4291,17 @@ "linjas nodeliste." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 msgid "Nodes(with conflicts)" msgstr "Noder (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Pending conflicts in the node list of this way" msgstr "Gjenværende konflikter i denne veiens nodeliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Members(resolved)" msgstr "Medlemmer (løst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4292,68 +4311,68 @@ "denne relasjonens medlemsliste." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Members(with conflicts)" msgstr "Medlemmer (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the member list of this relation" msgstr "Gjenværende konflikter i denne relasjonens medlemsliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "Ingen gjenværende egenskapskonflikter" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Properties(with conflicts)" msgstr "Egenskaper (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending property conflicts to be resolved" msgstr "Gjenværende egenskapskonflikter å løse" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "Konfliktløsning" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "parameter «current» utenfor rekkevidde: leste {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "Liste i rolle {0} er for øyeblikket ikke med i et sammenlikningspar." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "Uventet verdi for parameter «index». Leste {0}." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "fant ikke {0} i liste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "synkron rulling" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "Sammenlikn " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Lokal versjon" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "Liste over elementer i det lokale datasettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4361,5 +4380,5 @@ msgstr "Sammenslått versjon" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4369,18 +4388,18 @@ "sammenslåingsvalgene tas i bruk." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Tjenerversjon" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "Liste over elementer i tjenerens datasett" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> topp" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" @@ -4388,9 +4407,9 @@ "elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "> bunn" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" @@ -4398,5 +4417,5 @@ "elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4406,5 +4425,5 @@ "over sammenslåtte elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4414,5 +4433,5 @@ "lista over sammenslåtte elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4421,5 +4440,5 @@ "elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" @@ -4427,5 +4446,5 @@ "elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4435,5 +4454,5 @@ "lista over sammenslåtte elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4443,54 +4462,54 @@ "i lista over sammenslåtte elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "Opp" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "Flytt valgte elementer opp én plass" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "Ned" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "Flytt valgte elementer ned én plass" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Fjern" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "Fjern de valgte elementene fra lista over sammenslåtte elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "Lås" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Lås gjeldende liste over sammenslåtte elementer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "Lås opp" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "Lås opp lista over sammenslåtte elementer og begynn sammenslåing" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4501,5 +4520,5 @@ "tjeneroppføringer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4510,5 +4529,5 @@ "tjeneroppføringer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4517,5 +4536,5 @@ msgstr[1] "Lokal versjon ({0} oppføringer)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4524,5 +4543,5 @@ msgstr[1] "Sammenslått versjon ({0} oppføringer)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4531,6 +4550,6 @@ msgstr[1] "Tjenerens versjon ({0} oppføringer)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4539,6 +4558,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4549,5 +4568,5 @@ msgstr "Node" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando." @@ -4559,5 +4578,5 @@ msgstr "Uventet kolonneindeks: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4568,19 +4587,19 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "Kommunikasjon med tjener feilet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "Ja, gjenopprett også dem" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "Nei, avbryt operasjonen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4591,9 +4610,9 @@ "

Vil du gjenopprette også disse nodene?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "Gjenopprette ytterligere noder?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4605,5 +4624,5 @@ "slettet på tjeneren.

Vil du gjenopprette også dem?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "Gjenopprette avhengige objekter?" @@ -4629,84 +4648,84 @@ msgstr "Koordinater:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "Slettestatus:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "Synlighetsstatus:" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../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:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "slettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "ikke slettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 msgid "visible (on the server)" msgstr "synlig (på tjeneren)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "not visible (on the server)" msgstr "ikke synlig (på tjeneren)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 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:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Physically delete from local dataset" msgstr "Slett fra det lokale datasettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "Behold lokale koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "Behold tjenerens koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "Fjern avgjørelse fra koordinatkonflikt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "Behold lokal slettestatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "Behold tjenerens slettestatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "Fjern avgjørelse fra slettekonflikt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "Behold lokal synlighetsstatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "Ja, nullstill ID" -#: ../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:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "Nei, avbryt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4716,17 +4735,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "Nullstill ID" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "Behold tjenerens synlighetsstatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "Ja, rydd ut objektet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4737,9 +4756,9 @@ "OK?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "Fjern fra datasett" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "Fjern avgjørelse fra visningskonflikt" @@ -4754,19 +4773,19 @@ msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4782,10 +4801,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../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 @@ -4795,10 +4814,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4825,27 +4844,27 @@ msgstr "Tjenerens datasett" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr ">" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "Behold valgte nøkkel–verdi-par fra det lokale datasettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "Behold valgte nøkkel–verdi-par fra tjenerens datasettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 msgid "Undecide" msgstr "Fjern avgjørelse" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 msgid "Mark the selected tags as undecided" msgstr "Fjerner avgjørelse fra valgte egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4870,22 +4889,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4893,5 +4912,5 @@ msgstr "ingen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -4982,6 +5001,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -4992,5 +5011,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -5004,21 +5023,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -5026,5 +5045,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "" @@ -5111,10 +5130,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5134,17 +5153,17 @@ msgstr "Kommandoliste: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Løs" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "Åpne en dialog for å sammenføye element i lista ovenfor." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5153,25 +5172,25 @@ msgstr "Sett valgte kartobjekt til det som er valgt i lista ovenfor." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "Avbryt konfliktløsning og lukk vinduet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 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:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "Bruk løsninger" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Close anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "Fortsett å løse" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 #, java-format msgid "" @@ -5183,13 +5202,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "Løs konflikter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5201,8 +5220,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5269,5 +5288,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5299,34 +5318,34 @@ msgstr "Liste over alle innleste lag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Slett valgt Lag." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Vis/Skjul" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Slå av/på visning av Lag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Flytt laget en rad opp." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Flytt laget en rad ned." @@ -5336,18 +5355,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Dette vil endre opptil {0} objekt." -msgstr[1] "Dette vil endre opptil {0} objekt." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Nøkkelen blir ikke lagret når den er tom." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5356,10 +5374,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Endre verdier?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5368,5 +5386,5 @@ msgstr[1] "Endre egenskap på inntil {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5375,9 +5393,9 @@ msgstr[1] "Dette vil endre opptil {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Velg en nøkkel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Velg en verdi" @@ -5401,102 +5419,98 @@ msgstr "Medlem av" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Tilføy egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../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:794 +msgid "Properties / Memberships" +msgstr "Egenskaper / Medlemskap" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Skift relasjon" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Slett fra relasjon" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, 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:857 +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:859 +msgid "Delete Properties" +msgstr "DSlett egenskaper" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 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:589 -msgid "Edit Properties" -msgstr "Endre Oppsett" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 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:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Egenskaper: {0} / Medlemskap: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Egenskaper / Medlemskap" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Skift relasjon" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Slett fra relasjon" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, 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:867 -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:869 -msgid "Delete Properties" -msgstr "DSlett egenskaper" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Relasjoner" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Åpne en liste over alle relasjoner" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Relasjoner: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 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:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Slet valgt relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Oprett ny relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5525,5 +5539,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5535,14 +5549,14 @@ msgstr "Utvalg: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Frigjør panelet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 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:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Klikk for at minimere/maksimere panelet" @@ -5623,12 +5637,12 @@ #: ../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:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "Last ned medlemer av relasjon" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "Konflikter i data" @@ -5646,5 +5660,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5652,5 +5666,5 @@ #: ../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/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5658,18 +5672,18 @@ msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 -msgid "Tags and Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5678,14 +5692,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5695,9 +5709,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5707,15 +5721,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5723,5 +5737,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5729,20 +5743,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 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:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5751,66 +5765,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 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:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 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:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5819,9 +5833,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5830,41 +5844,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 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:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Last ned medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5874,19 +5888,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Laster ned programtillegg {0} …" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5907,10 +5928,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" msgstr "" @@ -5924,5 +5941,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -5992,9 +6009,9 @@ msgstr "Bokmerker" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -6003,52 +6020,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "min. breddegrad" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "min. lengdegrad" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "maks. breddegrad" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "maks. lengdegrad" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -6058,52 +6075,52 @@ "området)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Yttergrense for arbeidsområde" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Datakilder og typer" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "OpenStreetMap-data" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "GPS-rådata" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Last ned som nytt lag" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6111,39 +6128,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Last ned område" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Last ned" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "Området er for stort; vil sandsynligvis bli avvist av tjener" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "" "Områdets størrelse OK, størrelsen vil sannsynligvis aksepteres av tjener" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6165,21 +6182,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "Null pointer-feil, muligens manglende egenskaper." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6918,8 +6935,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7092,5 +7109,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7102,5 +7119,5 @@ msgstr "Type" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7147,5 +7164,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7159,5 +7176,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7168,5 +7185,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7175,19 +7192,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7197,32 +7214,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7244,5 +7261,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7308,12 +7325,12 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "Parameter «{0}» > 0 forventet – leste «{1}»." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 -#, fuzzy, java-format +#, java-format msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "Parameter «{0}» > 0 forventet – leste «{1}»." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128 @@ -7338,33 +7355,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 #, java-format msgid "Node {0}" msgstr "Node {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Zoom til problem" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 msgid "Zoom to this node in the current data layer" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "Last historikk" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 msgid "Open a history browser with the history of this node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 #, java-format msgid "Way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" @@ -7373,7 +7388,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "Meny for sortering av innstillinger" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7391,7 +7405,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7419,10 +7432,8 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} currently edited in layer ''{1}''" msgstr "" -"Trykk {0} for å begynne sammenslåingen av lokal- og " -"tjeneroppføringer" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 @@ -7433,7 +7444,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "Anonym" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7461,17 +7471,16 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Versjon {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "slettet" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 -#, fuzzy, java-format +#, java-format msgid "Version {0} currently edited in data layer ''{1}''" -msgstr "Versjon {0} lagt til {1} av {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 @@ -7524,10 +7533,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7738,5 +7747,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7759,17 +7768,17 @@ msgstr "Lag" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7785,7 +7794,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "" @@ -7828,29 +7837,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Last opp endringer" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7858,38 +7867,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 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/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7897,16 +7906,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7950,24 +7959,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Bilder for {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Les GPX …" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, 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:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, 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:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -7975,33 +7984,33 @@ msgstr "Leser {0} …" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Ingen bilder med lesbare tidsstempler funnet" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Geotaggede bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "GPS start: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "GPS-slutt: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "nåværende forskjell: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "tidssone-forskjell: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -8010,14 +8019,14 @@ msgstr[1] "bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} innenfor sporet." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Synkronisér klokke" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -8025,32 +8034,32 @@ msgstr "JPEG-bilder (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, 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:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, 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:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Bilde" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 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:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "GPS-enhetens tidssone (forskjell fra foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Synkronisér tidspunkt med GPS-enhet" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Den indtastede tid kunne ikke tolkes" @@ -8140,5 +8149,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8190,10 +8199,10 @@ msgstr[1] "{0} waypoints" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Konverter til datalag" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8203,11 +8212,11 @@ "skadeligt
Se her for å laste inn GPS spor:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8217,29 +8226,29 @@ msgstr "Konvertert fra: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Last ned fra OSM langs dette spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Last ned alt innenfor:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Max areal per forespørsel:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8250,9 +8259,9 @@ "Ønsker du
å fortsette?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "Ingen GPX-spor er tilgængelige i laget som kan assosieres med lyd." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8262,5 +8271,5 @@ "ble utelatt eller flyttet til start." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8270,23 +8279,23 @@ "utelatt." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Datalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "utenfor nedlastet område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "versjon {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 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:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8295,5 +8304,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8307,5 +8316,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8318,11 +8327,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8331,22 +8340,35 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} består av:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "ikke satt" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "API versjon: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Konvertér til GPX-lag" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "Fant ingen linje med «from»." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8441,9 +8463,9 @@ msgstr "Ingen eksisterende lydmerker i dette lag å forskyve." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Vis/skjul tekst/ikoner" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "Slå av/på visning av tekst/ikoner" @@ -8511,5 +8533,5 @@ "enda)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8517,5 +8539,5 @@ msgstr "Velg raden som skal endres" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8523,5 +8545,5 @@ msgstr "Ny verdi for {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8530,5 +8552,5 @@ msgstr "Velg raden som skal slettes" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Gi en ny nøkkel med verdi" @@ -8663,40 +8685,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:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "Tegnestil {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Lag: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Velg" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Velg en farge for {0}g" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "Sett til standard" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "Sett alt til standard" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 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:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Farger" @@ -9138,17 +9160,17 @@ msgstr "Du må starte JOSM for at enkelte innstillingene skal tre i kraft." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Vis koordinater som" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Projeksjonsmetode" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9158,5 +9180,5 @@ msgstr "Kartprojeksjon" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9214,81 +9236,81 @@ msgstr "Hurtigtast" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "Kort beskrivelse: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 #, java-format msgid "Author: {0}" msgstr "Opphavsperson: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format msgid "Webpage: {0}" msgstr "Nettside: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "Versjon: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9297,6 +9319,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9482,10 +9504,10 @@ msgstr "Kombinasjonstast grupper:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9495,13 +9517,13 @@ msgstr[1] "Fjern gamle egenskapsnøkler fra {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9509,18 +9531,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Valgfrie attributter:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "stengt_vei" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Ukjent type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9531,15 +9553,15 @@ msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Feil ved lesing av {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Element type {0} kan brukes." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9549,18 +9571,18 @@ msgstr[1] "Endre {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Intet er valgt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "Utvalget passer ikke formålet!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Bruk Objektmal" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Endre egenskaper" @@ -9576,6 +9598,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9584,8 +9606,21 @@ msgstr "Kontakter OSM-tjeneren …" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Laster ned punkt {0} til {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, fuzzy, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "Uventet ID-format i svar fra tjener – leste «{0}»" #. SAXException does not chain correctly @@ -9702,5 +9737,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." @@ -9708,6 +9743,6 @@ "Lokalt datasett har ikke noe element med ID {0}. Elementtype er ukjent." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9717,40 +9752,40 @@ msgstr "Laster ned OSM-data …" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, 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:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9816,5 +9851,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9827,66 +9862,66 @@ msgstr "Uventet format for ny versjon av endret element «{0}»: «{1}»" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Lukker endringssett …" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "Ingen base med rettinger tilstede for opplasting" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Forbereder …" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Laster opp …" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9921,5 +9956,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9946,5 +9981,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9952,5 +9987,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -9963,5 +9998,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10123,5 +10158,5 @@ msgstr "Fila «{0}» finnes ikke" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10130,38 +10165,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10169,19 +10204,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Ufullstendig -spesifikasjon med ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Ulovlig objekt med id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10191,10 +10226,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10204,25 +10237,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10688,5 +10721,5 @@ msgstr "(Teksten har alt blitt kopiert til utklippstavlen din.)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10695,12 +10728,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, 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/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10710,5 +10736,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10720,10 +10746,5 @@ "datasett
bryter en forhåndsbetingelse.
Feilmelding:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10732,5 +10753,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10739,5 +10760,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10746,9 +10767,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10758,5 +10786,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10765,5 +10793,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10772,5 +10800,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10779,10 +10807,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10791,10 +10819,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10805,5 +10833,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10813,5 +10841,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11542,5 +11570,5 @@ msgstr "Feil i fil {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11553,29 +11581,48 @@ #. 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:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Feil ved lasting av fil" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, fuzzy, java-format +msgid "Lambert Zone {0} cache file (.{0})" msgstr "Lambert Zone 1 cache file (.1)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, fuzzy, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "Lambert Zone 1 cache file (.1)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +#, fuzzy +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" msgstr "Lambert Zone 2 cache file (.2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +#, fuzzy +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "Lambert Zone 3 cache file (.3)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "Lambert Zone 4 cache file (.4)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -11604,13 +11651,13 @@ msgstr "Velg fra …" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "Matrikkel" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "Auto sourcing" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11623,13 +11670,13 @@ "Vil du gjenopprette bruken av F11 til å laste ned bilder?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "Gjenopprett F11-hurtigtast" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 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/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11922,43 +11969,49 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "Sone" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "Lambert sone" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "Lst område fra mellomlager (bare hvis mellomlager er aktivt)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, fuzzy, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" +"Lambert-sone {0} i hurtiglager ikke kompatibel med gjeldende Lambert-sone {1}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "Bytt område" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "Bruk et nytt områder for neste nedlasting" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "Legg til nytt lag" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "Område" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11968,5 +12021,5 @@ "www.cadastre.gouv.fr ." -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "Legg til nytt lag" @@ -11997,5 +12050,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "Tilpass WMS" @@ -12025,5 +12078,5 @@ "Velg ett og prøv på nytt" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -12031,28 +12084,28 @@ msgstr "Blankt lag" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMS lag ({0}), {1} kartutsnitt er lastet" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is not vectorized." msgstr "Er ikke vektorisert" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Raster size: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 msgid "Is vectorized." msgstr "Er vektorisert" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 #, java-format msgid "Commune bbox: {0}" msgstr "Kommune avgrensing: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -12063,9 +12116,9 @@ "Create a new one." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "Feil i mellomlager format" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -12073,16 +12126,7 @@ "Lambert-sone {0} i hurtiglager ikke kompatibel med gjeldende Lambert-sone {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" msgstr "Feil Lambert sone på mellomlager" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" -msgstr "" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67 @@ -13133,20 +13177,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "Vil du tillate dette?" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "Bekreft Remote Control handlinger" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "Remote Control har bedt om data fra denne URL:" @@ -13268,13 +13312,9 @@ msgstr "Zoom ut" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "Tøm bildehurtiglager" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "bilde " @@ -13857,6 +13897,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "Kystlinje i uorden" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14503,12 +14544,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Last ned" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Last ned kartdata fra OSM-tjeneren." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14546,7 +14585,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Fjerner doble noder …" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14612,29 +14650,29 @@ msgstr "Ingen gyldig WMS-URL eller ID" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "Tilpass posisjon på valgt WMS lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14643,5 +14681,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14649,10 +14687,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14667,24 +14705,24 @@ msgstr "Automatisk nedlasting" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, 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:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, 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:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14695,57 +14733,62 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 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:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Last ned synlige kartbilder" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Bytt oppløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "Last ned kartbilder med feil på nytt" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "Lagre WMS lag til fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "Lagre WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "les inn WMS lag fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "Last inn WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, 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:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "Feil Fil Format" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Bokmerker" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -27092,8 +27135,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "uvanlig kombinasjon av egenskaper" @@ -27113,34 +27155,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "NPE-kart" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "NPE-kart (Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: -#: build/trans_wms.java:13 +#: build/trans_wms.java:10 msgid "Yahoo Sat" msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 +#: build/trans_wms.java:11 msgid "OpenStreetMap" msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 +#: build/trans_wms.java:12 msgid "OpenCycleMap" msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 +#: build/trans_wms.java:13 msgid "TilesAtHome" msgstr "TilesAtHome" @@ -27150,9 +27181,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "Gater NRW Geofabrik.de" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -27166,35 +27200,863 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "" -#~ msgid "There's no primitive with version {0} in this history." -#~ msgstr "Denne historikken har ikke noe element med versjon {0}" - -#~ msgid "There's no version valid at date ''{0}'' in this history." -#~ msgstr "Denne historikken har ikke noen gyldig versjon for dato «{0}»" - -#~ msgid "No earliest version found. History is empty." -#~ msgstr "Fant ingen første versjon. Historikken er tom." - -#~ msgid "No latest version found. History is empty." -#~ msgstr "Fant ingen siste versjon. Historikken er tom." - -#~ msgid "Didn't find an primitive with id {0} in this dataset" -#~ msgstr "Fant ikke noe objekt med ID {0} i dette datasettet" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "NPE-kart" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "NPE-kart (Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Lambert Zone 2 cache file (.2)" +#~ msgstr "Lambert Zone 2 cache file (.2)" + +#~ msgid "Lambert Zone 3 cache file (.3)" +#~ msgstr "Lambert Zone 3 cache file (.3)" + +#~ msgid "Lambert Zone 4 cache file (.4)" +#~ msgstr "Lambert Zone 4 cache file (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)" +#~ msgstr "Lambert Zone 2 cache file (.2)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)" +#~ msgstr "Lambert Zone 3 cache file (.3)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)" +#~ msgstr "Lambert Zone 4 cache file (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#~ msgid "" +#~ "IMPORTANT : data positioned far away from\n" +#~ "the current Lambert zone limits.\n" +#~ "Do not upload any data after this message.\n" +#~ "Undo your last action, save your work\n" +#~ "and start a new layer on the new zone." +#~ msgstr "" +#~ "VIKTIG: data ligger langt unna\n" +#~ "grensene for den aktive Lambert-sonen.\n" +#~ "Ikke last opp data etter denne beskjeden.\n" +#~ "Angre siste handling, lagre arbeidet\n" +#~ "og start et nytt lag i en annen sone." + +#~ msgid "Edit Properties" +#~ msgstr "Endre Oppsett" + +#~ msgid "Move" +#~ msgstr "Flytt" + +#~ msgid "Unsaved Changes" +#~ msgstr "Ulagrede endringer" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Noen av nodene er (nesten) på linje" + +#~ msgid "Combine Anyway" +#~ msgstr "Sammenføy uansett" + +#~ msgid "Email" +#~ msgstr "E-post" + +#~ msgid "Can only edit help pages from JOSM Online Help" +#~ msgstr "Du kan bare redigere hjelpesider fra JOSM Online Help" + +#~ msgid "JOSM Online Help" +#~ msgstr "JOSM hjelpesider" + +#~ msgid "Error while loading page {0}" +#~ msgstr "Feil ved nedlasting av {0}" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "" +#~ "De valgte nodene er medlemmer i forskjellige relasjoner. Vil du fremdeles " +#~ "samle noder?" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Samle noder med forskjellige relasjoner?" + +#~ msgid "Merge Anyway" +#~ msgstr "Samle noder allikevel" + +#~ msgid "unnamed" +#~ msgstr "uten navn" + +#~ msgid "Only two nodes allowed" +#~ msgstr "Bare to noder tillatt" + +#~ 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 "Unknown file extension." +#~ msgstr "Ukjent filtype." + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "Yahoo (GNOME)" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Ingen data å oppdatere. Har du allerede åpnet eller lastet dette ned?" + +#~ msgid "" +#~ "This action will require {0} individual download requests. Do you wish to " +#~ "continue?" +#~ msgstr "Dette vil kreve {0} runder med download requests. Fortsette?" + +#~ msgid "No data imported." +#~ msgstr "Ingenting er importert." + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "{0} konflikter må løses i {1} objecter" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Slett {1} {0}" + +#~ msgid "Conflicting relation" +#~ msgstr "Relasjonen har konflikter" + +#~ msgid "Rotate" +#~ msgstr "Roter" + +#~ msgid "different" +#~ msgstr "forskjellig" + +#~ msgid "position" +#~ msgstr "posisjon" + +#~ msgid "false" +#~ msgstr "usann" + +#~ msgid "true" +#~ msgstr "sann" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326 (lengde- og breddegrad)" + +#~ msgid "their version:" +#~ msgstr "annen versjon:" + +#~ msgid "resolved version:" +#~ msgstr "rett versjon" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} object har konflikter:" +#~ msgstr[1] "{0} object har konflikter:" + +#~ msgid "my version:" +#~ msgstr "min versjon:" + +#~ msgid "Merging conflicts." +#~ msgstr "Konflikter ved sammenføyning." + +#~ msgid "Resolve Conflicts" +#~ msgstr "Løs Konflikter" + +#~ msgid "Object" +#~ msgstr "Objekt" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Oppfrisk liste - Klikk Reload" + +#~ msgid "Revert" +#~ msgstr "Tilbakestill" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "Tilbakestill status på alle valgte objekt til versjon som valgt i " +#~ "historikk." + +#~ msgid "Date" +#~ msgstr "Dato" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Konflikter: {0}" + +#~ msgid "Layers: {0}" +#~ msgstr "Lag: {0}" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Egenskaper (tom verdi fjerner egenskap)" + +#~ msgid "Occupied By" +#~ msgstr "Brukt av" + +#~ msgid "Remove Selected" +#~ msgstr "Fjern Utvalg" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Tilføy alle valgte objekt som medlemmer" + +#~ msgid "Basic" +#~ msgstr "Enkel" + +#~ msgid "Move Up" +#~ msgstr "Flytt opp" + +#~ msgid "There were conflicts during import." +#~ msgstr "Det var konflikter ved import." + +#~ msgid "Move Down" +#~ msgstr "Flytt ned" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Relasjons-editor: {0}" + +#~ msgid "Authors: {0}" +#~ msgstr "Opphavsmenn: {0}" + +#~ msgid "Show Author Panel" +#~ msgstr "Vis Opphavsmenn Panel" + +#~ msgid "Please enter the desired coordinates first." +#~ msgstr "Tast inn først de ønskede koordinater." + +#~ msgid "Select a bookmark first." +#~ msgstr "Velg først et bokmerke" + +#~ msgid "Please enter a search string" +#~ msgstr "Skriv inn en søkestreng" + +#~ msgid "zoom" +#~ msgstr "zoom" + +#~ msgid "name" +#~ msgstr "navn" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "Du kan bruke mus eller Ctrl+piltaster/./ for å zoome og panorere." + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Tilføy enten site-josm.xml eller Wiki-sider." + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Innloggings navnet (e-postadresse) til OSM kontoen." + +#~ msgid "OSM username (email)" +#~ msgstr "OSM brukernavn (e-postadressen)" + +#~ msgid "" +#~ "WARNING: The password is stored in plain text in the preferences " +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." +#~ msgstr "" +#~ "ADVARSEL: Passordet er lagret i vanlig tekst (IKKE KRYPTERT) i " +#~ "konfigurasjons filen.
Passordet er overført i vanlig tekst til " +#~ "serveren, satt inn i web adressen.
Ikke bruk et viktig passord da " +#~ "andre kan lese det." + +#~ msgid "Unknown version" +#~ msgstr "Ukjent versjon" + +#~ msgid "Delete and Download" +#~ msgstr "Slett og last ned" + +#~ msgid "Public" +#~ msgstr "Offentlig" + +#~ msgid "File could not be found." +#~ msgstr "Filen finnes ikke." + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Legg til ny Objektmal instilling i lista." + +#~ msgid "Tagging preset source" +#~ msgstr "Innstilling av Objektmaler" + +#~ msgid "Cannot read numeric value from response" +#~ msgstr "Finner ikke tallverdi i svaret" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "Versjon nummer mangler i OSM data" + +#~ msgid " has zero ref" +#~ msgstr " har zero ref" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "Opplasting av data feilet av ukjent grunn" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Intern feil i Server. Prøv med et mindre område eller vent litt før du " +#~ "prøver på nytt." + +#~ msgid "Ill-formed node id" +#~ msgstr "Feil id for node" + +#~ msgid "Found element in non-relation." +#~ msgstr "Fandt -element i en ikke-relation." + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} Programtillegg oppdatert. Restart JOSM." +#~ msgstr[1] "{0} Programtillegg oppdatert. Restart JOSM." + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "Programtillegget {0} kan være ødelagt eller kunne ikke lastes ned " +#~ "automatisk." + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Programtillegget krever oppdatering {0} av JOSM." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Kunne ikke laste programtillegg: {0} fra {1}" + +#~ msgid "" +#~ "(You can change the number of days after which this warning appears
by " +#~ "setting the config option 'pluginmanager.warntime'.)" +#~ msgstr "" +#~ "(Du kan endre antall dager mellom advarslene
ved å endre denne verdien " +#~ "i oppstettet 'pluginmanager.warntime'.)" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM " +#~ "utviklerne." + +#~ msgid "Plugin already exists" +#~ msgstr "Programtillegg finnes allerede" + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "Programtillegg lista er allerede tilgengelig. Vil du laste ned ny " +#~ "versjon over den eksisterende?\n" +#~ "\n" +#~ "{0}" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Feil ved sletting av programtillegg: {0}" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "" +#~ "Dette medfører at din sporlogg blir offentlig tilgjengelig på " +#~ "openstreetmap.org" + +#~ msgid "" +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." +#~ msgstr "" +#~ "Feil ved kobling av foto til GPX spor. Still inn rullefeltet for manuell " +#~ "kobling." + +#~ msgid "Change the projection to {0} first." +#~ msgstr "Bytt til kartprojeksjonen {0}." + +#~ msgid "Invalid projection" +#~ msgstr "Ugyldig kartprojeksjon" + +#~ msgid "Select Tableau d'Assemblage" +#~ msgstr "Velg Tableau d'Assemblage" + +#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" +#~ msgstr "sett Lambert sone manuelt (f.eks. for posisjoner mellom to soner)" + +#~ msgid "Open a layer first (GPX, OSM, cache)" +#~ msgstr "Først åpne lag (GPX, OSM, mellomlager)" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Juster posisjon til WMS laget" + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "Åpne vindu med OpenStreetBugs og aktiviser automatisk nedlasting" + +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgstr "" +#~ "Lambert sone {0} i mellomlager stemmer ikke med aktiv Lambert sone {1}" + +#~ msgid "Request Update" +#~ msgstr "Be op Oppdatering" + +#~ msgid "requested: {0}" +#~ msgstr "bestilt: {0}" + +#~ msgid "error loading metadata" +#~ msgstr "feil ved lesing av informasjon om data" + +#~ msgid "error requesting update" +#~ msgstr "feil ved bestilling av oppdatering" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Importer TCX fil som GPS spor" + +#~ msgid "Open User Page" +#~ msgstr "Åpne brukerside" + +#~ msgid "Continue anyway" +#~ msgstr "Fortsett uansett" + +#~ msgid "Sorry, doesn't work with anonymous users" +#~ msgstr "Beklager. Anonyme brukere får ikke lov til dette." + +#~ msgid "Replaces Selection with Users data" +#~ msgstr "Bytt ut utvalg med brukers data" + +#~ msgid "Please select some data" +#~ msgstr "Velg data først" + +#~ msgid "Open User Page in browser" +#~ msgstr "Åpne brukerside i utforsker" + +#~ msgid "Select User's Data" +#~ msgstr "Velg brukers data" + +#~ msgid "Please choose a user using the author panel" +#~ msgstr "Velg en bruker fra panel med opphavsmenn" + +#~ 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 "No intersections found. Nothing was changed." +#~ msgstr "Ingen skjæringspunkt funnet. Ingen endringer utført." + +#~ msgid "Validate" +#~ msgstr "Valider" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Valider enten aktivt utvalg eller hele datasett." + +#~ msgid "WMS Plugin Help" +#~ msgstr "Hjelp WMS tilleggsprogram" + +#~ msgid "help" +#~ msgstr "hjelp" + +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier bilde id" + +#~ msgid "Help / About" +#~ msgstr "Hjelp / Om" + +#~ msgid "rectifier id={0}" +#~ msgstr "rectifier id={0}" + +#~ msgid "" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" +#~ "\n" +#~ "You can also do this manually in the Advanced Preferences, using the " +#~ "following schema:\n" +#~ "wmsplugin.url.1.name=Landsat\n" +#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" +#~ "wmsplugin.url.2.name=NPE Maps... etc\n" +#~ "\n" +#~ "Full WMS URL input format example (landsat)\n" +#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" +#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n" +#~ "format=image/jpeg \n" +#~ "\n" +#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " +#~ "only need to input the relevant 'id'.\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example,replacing 73 with your image id: \n" +#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" +#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" +#~ " \n" +#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't " +#~ "use." +#~ msgstr "" +#~ "Du kan legge til, endre eller slette WMS kilder i WMSplugin Innstillinger " +#~ "- disse vil vises i WMS menyen.\n" +#~ "Kan også settes manuelt i Avanserte innstillinger, etter følgende mal:\n" +#~ "wmsplugin.url.1.name=Landsat\n" +#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" +#~ "wmsplugin.url.2.name=NPE Maps... osv\n" +#~ "\n" +#~ "Full WMS URL input format eksempel (landsat)\n" +#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" +#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n" +#~ "format=image/jpeg \n" +#~ "\n" +#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , må " +#~ "du bare oppgi gyldig 'id'.\n" +#~ "Å legge inn Metacarta Map Rectifier menyer, lag en URL manuelt som i " +#~ "dette eksempelet. Bytt ut 73 med din bilde id: \n" +#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" +#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" +#~ " \n" +#~ "OBS: Sjekk at bildet er egnet med hensyn til kopibeskyttelse. Er du i " +#~ "tvil: la være å bruke bildet." + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "" +#~ "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS" + +#~ msgid "Please select the row to copy." +#~ msgstr "Velg raden du vil kopiere." + +#~ msgid "" +#~ "The main feature of the plugin is the possibility to delete points of the " +#~ "GPX track. This plugin can be used to prepare tracks for uploading to " +#~ "OSM eg. deleting uninteresting parts of track." +#~ msgstr "" +#~ "Programtilleggets hovedfunksjon er sletting av punkt i GPX sporfil. " +#~ "Programtillegget kan brukes for klargjøring og redigering av GPC spor " +#~ "(fjerne uinteressante punkt) før opplasting til OSM." + +#~ msgid "Directly load TCX files from JOSM." +#~ msgstr "Last inn TCX filer direkte fra JOSM." + +#~ msgid "Station" +#~ msgstr "Stasjon" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Sammenføye linjer med forskjellig tilhørighet?" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?" + +#~ msgid "All the ways were empty" +#~ msgstr "Alle linjene var tomme" + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Velg linjer med tilnærmet vinkelrette knekk for vinkling." + +#~ msgid "Please select one or more closed ways of at least four nodes." +#~ msgstr "Velg en eller flere lukkede linjer med minst fire noder." + +#~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "Velg minst en node,linje eller relasjon. Bare opplastede element har " +#~ "historikk.." + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "Ignorerer en linje fordi den har en node som ikke eksisterer: {0}\n" + +#~ msgid "Found element in non-way." +#~ msgstr "Fant element i ikke_linje." + +#~ msgid "Map Type" +#~ msgstr "Karttype" + +#~ msgid "citymap" +#~ msgstr "bykart" + +#~ msgid "hikingmap" +#~ msgstr "turkart" + +#~ msgid "map" +#~ msgstr "kart" + +#~ msgid "bicyclemap" +#~ msgstr "sykkelkart" + +#~ msgid "board" +#~ msgstr "infotavle" + +#~ msgid "Image with path {0} does not exist or is not readable." +#~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart." + +#~ msgid "% of lon:" +#~ msgstr "% av lengden:" + +#~ msgid "Please select at least one task to download" +#~ msgstr "Velg minst én oppgave å laste ned" + +#~ msgid "Open in Browser" +#~ msgstr "Åpne i nettleser" + +#~ msgid "History of Element" +#~ msgstr "Historikk for elementet" + +#~ msgid "Only one node selected" +#~ msgstr "Bare én node er valgt" + +#~ msgid "Update failed" +#~ msgstr "Oppdatering feilet" + +#~ msgid "Update Data" +#~ msgstr "Oppdater data" + +#~ msgid "Upload to OSM..." +#~ msgstr "Last opp til OSM …" + +#~ msgid "Data Layer" +#~ msgstr "Datalag" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Kan ikke åpne innstillingsmappe: {0}" + +#~ msgid "nodes" +#~ msgstr "noder" + +#~ msgid "relations" +#~ msgstr "relasjoner" + +#~ msgid "ways" +#~ msgstr "linjer" + +#~ msgid "Empty member in relation." +#~ msgstr "Tomt medlem i relasjon." + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Kontakter OSM-tjeneren …" + +#~ msgid "Error while parsing" +#~ msgstr "Feil ved tolking" + +#~ msgid "File not found" +#~ msgstr "Fant ikke fila" + +#~ msgid "" +#~ "WARNING: launching browser windows for the first {0} of {1} selected " +#~ "primitives only" +#~ msgstr "" +#~ "ADVARSEL: Starter leservindu kun for de første {0} av {1} valgte objektene" + +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "Klarte ikke starte API. Prøv igjen senere." + +#~ msgid "API initialization failed" +#~ msgstr "Klarte ikke starte API" + +#~ msgid "Missing primitive" +#~ msgstr "Mangler objekt" + +#~ msgid "Updates the currently selected primitives from the server" +#~ msgstr "Oppdaterer de valgte objektene fra tjeneren" + +#~ msgid "Conflict detected" +#~ msgstr "Konflikt oppdaget" + +#~ msgid "Upload to OSM API failed" +#~ msgstr "Klarte ikke laste opp til OSM-API" + +#~ msgid "Primitive already deleted" +#~ msgstr "Objekt allerede slettet" + +#~ msgid "Purging 1 primitive" +#~ msgstr "Rydder ut 1 objekt" + +#~ msgid "removing reference from way {0}" +#~ msgstr "fjerner henvisning fra vei {0}" #~ 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" +#~ msgid "Edit Station" +#~ msgstr "Rediger stasjon" + +#~ msgid "Import TCX File..." +#~ msgstr "Importer TCX-fil …" + +#~ 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 "Error parsing server response." +#~ msgstr "Klarte ikke lese tjenerrespons." + +#~ msgid "Cannot connect to server." +#~ msgstr "Klarte ikke koble til tjeneren." + +#~ msgid "Error when communicating with server." +#~ msgstr "Klarte ikke kommunisere med tjener." + +#~ msgid "Cannot read place search results from server" +#~ msgstr "Klarte ikke lese søkeresultat om sted fra tjener" + +#~ msgid "Tagging preset sources" +#~ msgstr "Kilder for objektmaler" + +#~ msgid "" +#~ "The sources (URL or filename) of tagging preset definition files. See " +#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." +#~ msgstr "" +#~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se http://" +#~ "josm.openstreetmap.de/wiki/TaggingPresets for hjelp." + +#~ msgid "" +#~ "Tools to work with authors/users. Selects map data that belongs to " +#~ "selected user, opens browser showing selected author profile page." +#~ msgstr "" +#~ "Verktøy for å redigere opphavspersoner/brukere. Velger kartdata fra valgt " +#~ "bruker, åpner brukerprofil i nettleser." + +#~ msgid "Edit Information Office" +#~ msgstr "Rediger turistinformasjon" + +#~ msgid "Board Type" +#~ msgstr "Tavletype" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "Yahoo (WebKit)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "Yahoo (GNOME-fiks)" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "Yahoo (WebKit GTK)" + +#~ msgid "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 46.1° and 57° only.\n" +#~ "Use another projection system if you are not using\n" +#~ "a French WMS server.\n" +#~ "Do not upload any data after this message." +#~ msgstr "" +#~ "Kartprojeksjonen «{0}» er kun laget for\n" +#~ "nordlige grader mellom 46.1° og 57°.\n" +#~ "Velg annen kartprojeksjon når du ikke bruker\n" +#~ "en fransk WMS-tjener.\n" +#~ "Ikke last opp data etter denne beskjeden." + +#~ msgid "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 45.7° and 47.9°\n" +#~ "and longitutes between 5.7° and 10.6° only.\n" +#~ "Use another projection system if you are not working\n" +#~ "on a data set of Switzerland or Liechtenstein.\n" +#~ "Do not upload any data after this message." +#~ msgstr "" +#~ "Kartprojeksjonen «{0}» er bare beregnet på\n" +#~ "breddegrader mellom 45.7° og 47.9°\n" +#~ "og lengdegrader mellom 5.7° og 10.6°.\n" +#~ "Benytt en annen kartprojeksjon når du jobber\n" +#~ "andre steder enn Sveits eller Lichtenstein.\n" +#~ "Ikke last opp data etter denne meldingen." + +#~ msgid "Use preset ''{0}'' of group ''{1}''" +#~ msgstr "Bruk objektmal «{0}» i gruppe «{1}»" + +#~ msgid "Use preset ''{0}''" +#~ msgstr "Bruk objektmal «{0}»" + +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»" + +#~ msgid "" +#~ "Uploading failed because a primitive you tried " +#~ "to
delete on the server is already deleted.

The error message " +#~ "is:
{0}" +#~ msgstr "" +#~ "Opplasting feilet fordi et element du prøvde " +#~ "å
slette allerede er slettet på tjeneren.

Feilmelding:
{0}" + +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "parameter «{0}» må ha en verdi" + +#~ msgid "Apply partial resolutions" +#~ msgstr "Bruk ufullstendige løsninger" + +#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." +#~ msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}." + #~ msgid "Select a starting node on the end of a way" #~ msgstr "Velg en startnode i enden av en linje" +#~ msgid "History item" +#~ msgstr "Historikkobjekt" + #~ msgid "Reached the end of the line" #~ msgstr "Nådde slutten av linja" @@ -27202,10 +28064,4 @@ #~ msgid "Reached a junction" #~ msgstr "Nådde et kryss" - -#~ msgid "help" -#~ msgstr "hjelp" - -#~ msgid "Help / About" -#~ msgstr "Hjelp / Om" #~ msgid "" @@ -27257,727 +28113,4 @@ #~ "unbedenklich sind. Im Zweifel verzichten Sie auf die Nutzung." -#~ msgid "WMS Plugin Help" -#~ msgstr "Hjelp WMS tilleggsprogram" - -#~ msgid "Move" -#~ msgstr "Flytt" - -#~ msgid "Unsaved Changes" -#~ msgstr "Ulagrede endringer" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Noen av nodene er (nesten) på linje" - -#~ msgid "Combine Anyway" -#~ msgstr "Sammenføy uansett" - -#~ msgid "Email" -#~ msgstr "E-post" - -#~ msgid "Can only edit help pages from JOSM Online Help" -#~ msgstr "Du kan bare redigere hjelpesider fra JOSM Online Help" - -#~ msgid "JOSM Online Help" -#~ msgstr "JOSM hjelpesider" - -#~ msgid "Error while loading page {0}" -#~ msgstr "Feil ved nedlasting av {0}" - -#~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still " -#~ "want to merge them?" -#~ msgstr "" -#~ "De valgte nodene er medlemmer i forskjellige relasjoner. Vil du fremdeles " -#~ "samle noder?" - -#~ msgid "Merge nodes with different memberships?" -#~ msgstr "Samle noder med forskjellige relasjoner?" - -#~ msgid "Merge Anyway" -#~ msgstr "Samle noder allikevel" - -#~ msgid "unnamed" -#~ msgstr "uten navn" - -#~ msgid "Only two nodes allowed" -#~ msgstr "Bare to noder tillatt" - -#~ 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 "Unknown file extension." -#~ msgstr "Ukjent filtype." - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "Yahoo (GNOME)" - -#~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data " -#~ "layer?" -#~ msgstr "" -#~ "Ingen data å oppdatere. Har du allerede åpnet eller lastet dette ned?" - -#~ msgid "" -#~ "This action will require {0} individual download requests. Do you wish to " -#~ "continue?" -#~ msgstr "Dette vil kreve {0} runder med download requests. Fortsette?" - -#~ msgid "No data imported." -#~ msgstr "Ingenting er importert." - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "{0} konflikter må løses i {1} objecter" - -#~ msgid "Delete {1} {0}" -#~ msgstr "Slett {1} {0}" - -#~ msgid "Conflicting relation" -#~ msgstr "Relasjonen har konflikter" - -#~ msgid "Rotate" -#~ msgstr "Roter" - -#~ msgid "different" -#~ msgstr "forskjellig" - -#~ msgid "position" -#~ msgstr "posisjon" - -#~ msgid "false" -#~ msgstr "usann" - -#~ msgid "true" -#~ msgstr "sann" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326 (lengde- og breddegrad)" - -#~ msgid "their version:" -#~ msgstr "annen versjon:" - -#~ msgid "resolved version:" -#~ msgstr "rett versjon" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} object har konflikter:" -#~ msgstr[1] "{0} object har konflikter:" - -#~ msgid "my version:" -#~ msgstr "min versjon:" - -#~ msgid "Merging conflicts." -#~ msgstr "Konflikter ved sammenføyning." - -#~ msgid "Resolve Conflicts" -#~ msgstr "Løs Konflikter" - -#~ msgid "Object" -#~ msgstr "Objekt" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Oppfrisk liste - Klikk Reload" - -#~ msgid "Revert" -#~ msgstr "Tilbakestill" - -#~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." -#~ msgstr "" -#~ "Tilbakestill status på alle valgte objekt til versjon som valgt i " -#~ "historikk." - -#~ msgid "Date" -#~ msgstr "Dato" - -#~ msgid "Conflicts: {0}" -#~ msgstr "Konflikter: {0}" - -#~ msgid "Layers: {0}" -#~ msgstr "Lag: {0}" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Egenskaper (tom verdi fjerner egenskap)" - -#~ msgid "Occupied By" -#~ msgstr "Brukt av" - -#~ msgid "Remove Selected" -#~ msgstr "Fjern Utvalg" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Tilføy alle valgte objekt som medlemmer" - -#~ msgid "Basic" -#~ msgstr "Enkel" - -#~ msgid "Move Up" -#~ msgstr "Flytt opp" - -#~ msgid "There were conflicts during import." -#~ msgstr "Det var konflikter ved import." - -#~ msgid "Move Down" -#~ msgstr "Flytt ned" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "Relasjons-editor: {0}" - -#~ msgid "Authors: {0}" -#~ msgstr "Opphavsmenn: {0}" - -#~ msgid "Show Author Panel" -#~ msgstr "Vis Opphavsmenn Panel" - -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Tast inn først de ønskede koordinater." - -#~ msgid "Select a bookmark first." -#~ msgstr "Velg først et bokmerke" - -#~ msgid "Please enter a search string" -#~ msgstr "Skriv inn en søkestreng" - -#~ msgid "zoom" -#~ msgstr "zoom" - -#~ msgid "name" -#~ msgstr "navn" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "Du kan bruke mus eller Ctrl+piltaster/./ for å zoome og panorere." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Tilføy enten site-josm.xml eller Wiki-sider." - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Innloggings navnet (e-postadresse) til OSM kontoen." - -#~ msgid "OSM username (email)" -#~ msgstr "OSM brukernavn (e-postadressen)" - -#~ msgid "" -#~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded " -#~ "in the URL.
Do not use a valuable Password." -#~ msgstr "" -#~ "ADVARSEL: Passordet er lagret i vanlig tekst (IKKE KRYPTERT) i " -#~ "konfigurasjons filen.
Passordet er overført i vanlig tekst til " -#~ "serveren, satt inn i web adressen.
Ikke bruk et viktig passord da " -#~ "andre kan lese det." - -#~ msgid "Unknown version" -#~ msgstr "Ukjent versjon" - -#~ msgid "Delete and Download" -#~ msgstr "Slett og last ned" - -#~ msgid "Public" -#~ msgstr "Offentlig" - -#~ msgid "File could not be found." -#~ msgstr "Filen finnes ikke." - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Legg til ny Objektmal instilling i lista." - -#~ msgid "Tagging preset source" -#~ msgstr "Innstilling av Objektmaler" - -#~ msgid "Cannot read numeric value from response" -#~ msgstr "Finner ikke tallverdi i svaret" - -#~ msgid "Version number missing from OSM data" -#~ msgstr "Versjon nummer mangler i OSM data" - -#~ msgid " has zero ref" -#~ msgstr " har zero ref" - -#~ msgid "Data upload failed for unknown reason" -#~ msgstr "Opplasting av data feilet av ukjent grunn" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Intern feil i Server. Prøv med et mindre område eller vent litt før du " -#~ "prøver på nytt." - -#~ msgid "Ill-formed node id" -#~ msgstr "Feil id for node" - -#~ msgid "Found element in non-relation." -#~ msgstr "Fandt -element i en ikke-relation." - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} Programtillegg oppdatert. Restart JOSM." -#~ msgstr[1] "{0} Programtillegg oppdatert. Restart JOSM." - -#~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." -#~ msgstr "" -#~ "Programtillegget {0} kan være ødelagt eller kunne ikke lastes ned " -#~ "automatisk." - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Programtillegget krever oppdatering {0} av JOSM." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Kunne ikke laste programtillegg: {0} fra {1}" - -#~ msgid "" -#~ "(You can change the number of days after which this warning appears
by " -#~ "setting the config option 'pluginmanager.warntime'.)" -#~ msgstr "" -#~ "(Du kan endre antall dager mellom advarslene
ved å endre denne verdien " -#~ "i oppstettet 'pluginmanager.warntime'.)" - -#~ msgid "" -#~ "The plugin could not be removed. Please tell the people you got JOSM from " -#~ "about the problem." -#~ msgstr "" -#~ "Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM " -#~ "utviklerne." - -#~ msgid "Plugin already exists" -#~ msgstr "Programtillegg finnes allerede" - -#~ msgid "" -#~ "Plugin archive already available. Do you want to download the current " -#~ "version by deleting existing archive?\n" -#~ "\n" -#~ "{0}" -#~ msgstr "" -#~ "Programtillegg lista er allerede tilgengelig. Vil du laste ned ny " -#~ "versjon over den eksisterende?\n" -#~ "\n" -#~ "{0}" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Feil ved sletting av programtillegg: {0}" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "" -#~ "Dette medfører at din sporlogg blir offentlig tilgjengelig på " -#~ "openstreetmap.org" - -#~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You " -#~ "can adjust the sliders to manually match the photos." -#~ msgstr "" -#~ "Feil ved kobling av foto til GPX spor. Still inn rullefeltet for manuell " -#~ "kobling." - -#~ msgid "Change the projection to {0} first." -#~ msgstr "Bytt til kartprojeksjonen {0}." - -#~ msgid "Invalid projection" -#~ msgstr "Ugyldig kartprojeksjon" - -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Velg Tableau d'Assemblage" - -#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" -#~ msgstr "sett Lambert sone manuelt (f.eks. for posisjoner mellom to soner)" - -#~ msgid "Open a layer first (GPX, OSM, cache)" -#~ msgstr "Først åpne lag (GPX, OSM, mellomlager)" - -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "Juster posisjon til WMS laget" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "Åpne vindu med OpenStreetBugs og aktiviser automatisk nedlasting" - -#~ msgid "" -#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#~ msgstr "" -#~ "Lambert sone {0} i mellomlager stemmer ikke med aktiv Lambert sone {1}" - -#~ msgid "Request Update" -#~ msgstr "Be op Oppdatering" - -#~ msgid "requested: {0}" -#~ msgstr "bestilt: {0}" - -#~ msgid "error loading metadata" -#~ msgstr "feil ved lesing av informasjon om data" - -#~ msgid "error requesting update" -#~ msgstr "feil ved bestilling av oppdatering" - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Importer TCX fil som GPS spor" - -#~ msgid "Open User Page" -#~ msgstr "Åpne brukerside" - -#~ msgid "Continue anyway" -#~ msgstr "Fortsett uansett" - -#~ msgid "Sorry, doesn't work with anonymous users" -#~ msgstr "Beklager. Anonyme brukere får ikke lov til dette." - -#~ msgid "Replaces Selection with Users data" -#~ msgstr "Bytt ut utvalg med brukers data" - -#~ msgid "Please select some data" -#~ msgstr "Velg data først" - -#~ msgid "Open User Page in browser" -#~ msgstr "Åpne brukerside i utforsker" - -#~ msgid "Select User's Data" -#~ msgstr "Velg brukers data" - -#~ msgid "Please choose a user using the author panel" -#~ msgstr "Velg en bruker fra panel med opphavsmenn" - -#~ 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 "No intersections found. Nothing was changed." -#~ msgstr "Ingen skjæringspunkt funnet. Ingen endringer utført." - -#~ msgid "Validate" -#~ msgstr "Valider" - -#~ msgid "Validate either current selection or complete dataset." -#~ msgstr "Valider enten aktivt utvalg eller hele datasett." - -#~ msgid "Metacarta Map Rectifier image id" -#~ msgstr "Metacarta Map Rectifier bilde id" - -#~ msgid "rectifier id={0}" -#~ msgstr "rectifier id={0}" - -#~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " -#~ "- these will then show up in the WMS menu.\n" -#~ "\n" -#~ "You can also do this manually in the Advanced Preferences, using the " -#~ "following schema:\n" -#~ "wmsplugin.url.1.name=Landsat\n" -#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" -#~ "wmsplugin.url.2.name=NPE Maps... etc\n" -#~ "\n" -#~ "Full WMS URL input format example (landsat)\n" -#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" -#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n" -#~ "format=image/jpeg \n" -#~ "\n" -#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " -#~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " -#~ "in this example,replacing 73 with your image id: \n" -#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" -#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" -#~ " \n" -#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't " -#~ "use." -#~ msgstr "" -#~ "Du kan legge til, endre eller slette WMS kilder i WMSplugin Innstillinger " -#~ "- disse vil vises i WMS menyen.\n" -#~ "Kan også settes manuelt i Avanserte innstillinger, etter følgende mal:\n" -#~ "wmsplugin.url.1.name=Landsat\n" -#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" -#~ "wmsplugin.url.2.name=NPE Maps... osv\n" -#~ "\n" -#~ "Full WMS URL input format eksempel (landsat)\n" -#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" -#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n" -#~ "format=image/jpeg \n" -#~ "\n" -#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , må " -#~ "du bare oppgi gyldig 'id'.\n" -#~ "Å legge inn Metacarta Map Rectifier menyer, lag en URL manuelt som i " -#~ "dette eksempelet. Bytt ut 73 med din bilde id: \n" -#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" -#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" -#~ " \n" -#~ "OBS: Sjekk at bildet er egnet med hensyn til kopibeskyttelse. Er du i " -#~ "tvil: la være å bruke bildet." - -#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -#~ msgstr "" -#~ "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS" - -#~ msgid "Please select the row to copy." -#~ msgstr "Velg raden du vil kopiere." - -#~ msgid "" -#~ "The main feature of the plugin is the possibility to delete points of the " -#~ "GPX track. This plugin can be used to prepare tracks for uploading to " -#~ "OSM eg. deleting uninteresting parts of track." -#~ msgstr "" -#~ "Programtilleggets hovedfunksjon er sletting av punkt i GPX sporfil. " -#~ "Programtillegget kan brukes for klargjøring og redigering av GPC spor " -#~ "(fjerne uinteressante punkt) før opplasting til OSM." - -#~ msgid "Directly load TCX files from JOSM." -#~ msgstr "Last inn TCX filer direkte fra JOSM." - -#~ msgid "Station" -#~ msgstr "Stasjon" - -#~ msgid "Combine ways with different memberships?" -#~ msgstr "Sammenføye linjer med forskjellig tilhørighet?" - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?" - -#~ msgid "All the ways were empty" -#~ msgstr "Alle linjene var tomme" - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "Velg linjer med tilnærmet vinkelrette knekk for vinkling." - -#~ msgid "Please select one or more closed ways of at least four nodes." -#~ msgstr "Velg en eller flere lukkede linjer med minst fire noder." - -#~ msgid "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." -#~ msgstr "" -#~ "Velg minst en node,linje eller relasjon. Bare opplastede element har " -#~ "historikk.." - -#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -#~ msgstr "Ignorerer en linje fordi den har en node som ikke eksisterer: {0}\n" - -#~ msgid "Found element in non-way." -#~ msgstr "Fant element i ikke_linje." - -#~ msgid "Map Type" -#~ msgstr "Karttype" - -#~ msgid "citymap" -#~ msgstr "bykart" - -#~ msgid "hikingmap" -#~ msgstr "turkart" - -#~ msgid "map" -#~ msgstr "kart" - -#~ msgid "bicyclemap" -#~ msgstr "sykkelkart" - -#~ msgid "board" -#~ msgstr "infotavle" - -#~ msgid "Image with path {0} does not exist or is not readable." -#~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart." - -#~ msgid "% of lon:" -#~ msgstr "% av lengden:" - -#~ msgid "Please select at least one task to download" -#~ msgstr "Velg minst én oppgave å laste ned" - -#~ msgid "Open in Browser" -#~ msgstr "Åpne i nettleser" - -#~ msgid "History of Element" -#~ msgstr "Historikk for elementet" - -#~ msgid "Only one node selected" -#~ msgstr "Bare én node er valgt" - -#~ msgid "Update failed" -#~ msgstr "Oppdatering feilet" - -#~ msgid "Update Data" -#~ msgstr "Oppdater data" - -#~ msgid "Upload to OSM..." -#~ msgstr "Last opp til OSM …" - -#~ msgid "Data Layer" -#~ msgstr "Datalag" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Kan ikke åpne innstillingsmappe: {0}" - -#~ msgid "nodes" -#~ msgstr "noder" - -#~ msgid "relations" -#~ msgstr "relasjoner" - -#~ msgid "ways" -#~ msgstr "linjer" - -#~ msgid "Empty member in relation." -#~ msgstr "Tomt medlem i relasjon." - -#~ msgid "Contacting the OSM server..." -#~ msgstr "Kontakter OSM-tjeneren …" - -#~ msgid "Error while parsing" -#~ msgstr "Feil ved tolking" - -#~ msgid "File not found" -#~ msgstr "Fant ikke fila" - -#~ msgid "" -#~ "WARNING: launching browser windows for the first {0} of {1} selected " -#~ "primitives only" -#~ msgstr "" -#~ "ADVARSEL: Starter leservindu kun for de første {0} av {1} valgte objektene" - -#~ msgid "Failed to initialize API. Please try again later." -#~ msgstr "Klarte ikke starte API. Prøv igjen senere." - -#~ msgid "API initialization failed" -#~ msgstr "Klarte ikke starte API" - -#~ msgid "Missing primitive" -#~ msgstr "Mangler objekt" - -#~ msgid "Updates the currently selected primitives from the server" -#~ msgstr "Oppdaterer de valgte objektene fra tjeneren" - -#~ msgid "Conflict detected" -#~ msgstr "Konflikt oppdaget" - -#~ msgid "Upload to OSM API failed" -#~ msgstr "Klarte ikke laste opp til OSM-API" - -#~ msgid "Primitive already deleted" -#~ msgstr "Objekt allerede slettet" - -#~ msgid "Purging 1 primitive" -#~ msgstr "Rydder ut 1 objekt" - -#~ msgid "removing reference from way {0}" -#~ msgstr "fjerner henvisning fra vei {0}" - -#~ msgid "Edit Station" -#~ msgstr "Rediger stasjon" - -#~ msgid "Import TCX File..." -#~ msgstr "Importer TCX-fil …" - -#~ 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 "Error parsing server response." -#~ msgstr "Klarte ikke lese tjenerrespons." - -#~ msgid "Cannot connect to server." -#~ msgstr "Klarte ikke koble til tjeneren." - -#~ msgid "Error when communicating with server." -#~ msgstr "Klarte ikke kommunisere med tjener." - -#~ msgid "Cannot read place search results from server" -#~ msgstr "Klarte ikke lese søkeresultat om sted fra tjener" - -#~ msgid "Tagging preset sources" -#~ msgstr "Kilder for objektmaler" - -#~ msgid "" -#~ "The sources (URL or filename) of tagging preset definition files. See " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." -#~ msgstr "" -#~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se http://" -#~ "josm.openstreetmap.de/wiki/TaggingPresets for hjelp." - -#~ msgid "" -#~ "Tools to work with authors/users. Selects map data that belongs to " -#~ "selected user, opens browser showing selected author profile page." -#~ msgstr "" -#~ "Verktøy for å redigere opphavspersoner/brukere. Velger kartdata fra valgt " -#~ "bruker, åpner brukerprofil i nettleser." - -#~ msgid "Edit Information Office" -#~ msgstr "Rediger turistinformasjon" - -#~ msgid "Board Type" -#~ msgstr "Tavletype" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "Yahoo (WebKit)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "Yahoo (GNOME-fiks)" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "Yahoo (WebKit GTK)" - -#~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 46.1° and 57° only.\n" -#~ "Use another projection system if you are not using\n" -#~ "a French WMS server.\n" -#~ "Do not upload any data after this message." -#~ msgstr "" -#~ "Kartprojeksjonen «{0}» er kun laget for\n" -#~ "nordlige grader mellom 46.1° og 57°.\n" -#~ "Velg annen kartprojeksjon når du ikke bruker\n" -#~ "en fransk WMS-tjener.\n" -#~ "Ikke last opp data etter denne beskjeden." - -#~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 45.7° and 47.9°\n" -#~ "and longitutes between 5.7° and 10.6° only.\n" -#~ "Use another projection system if you are not working\n" -#~ "on a data set of Switzerland or Liechtenstein.\n" -#~ "Do not upload any data after this message." -#~ msgstr "" -#~ "Kartprojeksjonen «{0}» er bare beregnet på\n" -#~ "breddegrader mellom 45.7° og 47.9°\n" -#~ "og lengdegrader mellom 5.7° og 10.6°.\n" -#~ "Benytt en annen kartprojeksjon når du jobber\n" -#~ "andre steder enn Sveits eller Lichtenstein.\n" -#~ "Ikke last opp data etter denne meldingen." - -#~ msgid "Use preset ''{0}'' of group ''{1}''" -#~ msgstr "Bruk objektmal «{0}» i gruppe «{1}»" - -#~ msgid "Use preset ''{0}''" -#~ msgstr "Bruk objektmal «{0}»" - -#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -#~ msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»" - -#~ msgid "" -#~ "Uploading failed because a primitive you tried " -#~ "to
delete on the server is already deleted.

The error message " -#~ "is:
{0}" -#~ msgstr "" -#~ "Opplasting feilet fordi et element du prøvde " -#~ "å
slette allerede er slettet på tjeneren.

Feilmelding:
{0}" - -#~ msgid "parameter '{0}' must not be null" -#~ msgstr "parameter «{0}» må ha en verdi" - -#~ msgid "Apply partial resolutions" -#~ msgstr "Bruk ufullstendige løsninger" - -#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -#~ msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}." - -#~ msgid "History item" -#~ msgstr "Historikkobjekt" - #~ msgid "Layer {0} must be in list of layers" #~ msgstr "Lag {0} må være i listen over lag" @@ -28008,4 +28141,7 @@ #~ "HREF=\"{1}\">norsk (bokmål)." +#~ msgid "Didn't find an primitive with id {0} in this dataset" +#~ msgstr "Fant ikke noe objekt med ID {0} i dette datasettet" + #~ msgid "Helppage missing. Create it in English." #~ msgstr "Hjelp mangler. Kan lages i English." @@ -28021,4 +28157,16 @@ #~ msgstr "Uventet returverdi. Mottok {0}." +#~ msgid "There's no primitive with version {0} in this history." +#~ msgstr "Denne historikken har ikke noe element med versjon {0}" + +#~ msgid "There's no version valid at date ''{0}'' in this history." +#~ msgstr "Denne historikken har ikke noen gyldig versjon for dato «{0}»" + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "Fant ingen første versjon. Historikken er tom." + +#~ msgid "No latest version found. History is empty." +#~ msgstr "Fant ingen siste versjon. Historikken er tom." + #~ msgid "Index out of bounds. Got {0}." #~ msgstr "Indeks er utenfor rekkevidde: {0}"