Index: applications/editors/josm/i18n/po/nb.po =================================================================== --- applications/editors/josm/i18n/po/nb.po (revision 19246) +++ applications/editors/josm/i18n/po/nb.po (revision 19319) @@ -5,4 +5,5 @@ # #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 @@ -11,6 +12,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 14:44+0100\n" -"PO-Revision-Date: 2009-12-25 13:19+0000\n" +"POT-Creation-Date: 2010-01-07 10:57+0100\n" +"PO-Revision-Date: 2010-01-01 15:34+0000\n" "Last-Translator: Tor Christian Tovslid \n" "Language-Team: Norwegian Bokmal \n" @@ -19,9 +20,9 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-01-01 13:21+0000\n" +"X-Launchpad-Export-Date: 2010-01-07 08:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: ../core/src/org/openstreetmap/josm/Main.java:208 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 msgid "Creating main GUI" msgstr "Bygger opp hovedskjermbilde" @@ -88,9 +89,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 @@ -117,5 +118,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:506 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 @@ -123,6 +124,6 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -134,9 +135,9 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -175,5 +176,4 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 @@ -201,6 +201,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724 @@ -295,4 +295,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123 msgid "Continue" msgstr "Fortsett" @@ -323,5 +324,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 @@ -337,7 +338,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 +#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 @@ -469,6 +473,7 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -547,5 +552,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -559,5 +564,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 msgid "Information" msgstr "Informasjon" @@ -756,15 +761,15 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 -#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 +#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98 msgid "Delete" msgstr "Slett" @@ -842,6 +847,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 @@ -1487,14 +1492,15 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 msgid "Preferences..." msgstr "Innstillinger …" -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -msgid "Open a preferences page for global settings." +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 +#, fuzzy +msgid "Open a preferences dialog for global settings." msgstr "Åpne side med globale innstillinger." -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60 msgid "Preferences" msgstr "Innstillinger" @@ -1638,17 +1644,17 @@ msgstr "Hjelp: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117 msgid "Status Report" msgstr "Statusrapport" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118 msgid "Copy to clipboard and close" msgstr "Kopier til utklippstavlen og lukk" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1783,33 +1789,33 @@ msgstr "Denne noden har ikke knytninger" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 msgid "None of these nodes are glued to anything else." msgstr "Ingen av disse nodene har knytninger." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 msgid "None of this way's nodes are glued to anything else." msgstr "Ingen noder i denne linjen har andre knytninger." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 msgid "The current selection cannot be used for unglueing." msgstr "Valgte element har ikke knytninger som kan løses." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "Select either:" msgstr "Velg:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One tagged node, or" msgstr "* En node med egenskaper, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way, or" msgstr "– En node som brukes av flere linjer, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "– En node som er brukt av flere linjer, og en av linjene, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1817,10 +1823,10 @@ "– En linje som har en eller flere noder, som er brukt av flere linjer, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "– En linje, og en eller flere av nodene som er brukt i flere linjer." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1833,9 +1839,9 @@ "kopier og alle noder bli valgt." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 msgid "Unglued Node" msgstr "Node uten tilknytning" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1843,5 +1849,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -2006,4 +2012,6 @@ #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274 msgid "Back" msgstr "Tilbake" @@ -3218,24 +3226,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94 #, java-format msgid "Preferences stored on {0}" msgstr "Innstillinger lagret i {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Kunne ikke laste opp innstillinger. Årsak: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118 msgid "Could not load preferences from server." msgstr "Klarte ikke lese innstillinger fra tjener." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212 #, java-format msgid "" @@ -3244,5 +3252,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229 #, java-format msgid "" @@ -3253,5 +3261,5 @@ #: ../core/src/org/openstreetmap/josm/data/Version.java:46 #, java-format -msgid "Failed to load load resource ''{0}''. Error is {1}" +msgid "Failed to load resource ''{0}'', error is {1}." msgstr "" @@ -3665,6 +3673,6 @@ #. dark blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 @@ -3830,5 +3838,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3843,10 +3851,10 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318 msgid "highway" msgstr "ferdselsvei" #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319 #: build/trans_presets.java:3189 msgid "railway" @@ -3854,15 +3862,15 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320 msgid "waterway" msgstr "vannvei" #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321 msgid "landuse" msgstr "bruk av grunn" #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341 @@ -3875,6 +3883,11 @@ msgstr[1] "{0} noder" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 +#, fuzzy +msgid "public transport" +msgstr "Offentlig transport" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371 #, java-format msgid "{0} member" @@ -3883,5 +3896,5 @@ msgstr[1] "{0} medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3923,9 +3936,19 @@ msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248 +#, fuzzy +msgid "Authentication Failed" +msgstr "Tilkobling mislykkes" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264 +#, fuzzy +msgid "Authorisation Failed" +msgstr "Tilkobling mislykkes" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283 msgid "Unknown host" msgstr "Ukjent vert" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386 msgid "Object deleted" msgstr "" @@ -4031,65 +4054,65 @@ msgstr "Passord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71 msgid "usage" msgstr "bruk" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73 msgid "options" msgstr "innstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74 msgid "Show this help" msgstr "Vis hjelp" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 msgid "Standard unix geometry argument" msgstr "Standard Unix-geometri" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "Download the bounding box" msgstr "Last ned områdeavgrensing" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Last ned området i URL (with lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "Open file (as raw gps, if .gpx)" msgstr "Åpne fil (som rå gps, dersom .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Download the bounding box as raw gps" msgstr "Last ned områdeavgrensing som rå gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Select with the given search" msgstr "Velg med gitt søkestreng" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Launch in maximized mode" msgstr "Start maksimert" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Reset the preferences to default" msgstr "Gå tilbake til standardinnstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 msgid "Set the language." msgstr "Velg språk" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4098,9 +4121,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "examples" msgstr "eksempler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4110,25 +4133,25 @@ "du prøver --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "Instead of --download= you may specify osm://\n" msgstr "I stedet for --download= kan du bruke osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 msgid "Activating updated plugins" msgstr "Gjør opplastede programtillegg tilgjengelig" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 msgid "Loading early plugins" msgstr "Laster første programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Setting defaults" msgstr "Setter standardverdier" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 msgid "Loading plugins" msgstr "Laster inn programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -4141,5 +4164,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4148,5 +4171,5 @@ #: ../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/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642 @@ -4254,5 +4277,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119 +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128 msgid "User:" msgstr "" @@ -4947,5 +4970,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4960,5 +4983,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 @@ -4966,5 +4989,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5054,5 +5077,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22 msgid "none" msgstr "ingen" @@ -5232,5 +5255,5 @@ "to keep the first way and remove the other " "ways that are members of the same relation: the combined way will take the " -"place of the original way in the membership." +"place of the original way in the relation." msgstr "" @@ -5242,5 +5265,5 @@ "to keep the first node and remove the " "other nodes that are members of the same relation: the target node will take " -"the place of the original node in the membership." +"the place of the original node in the relation." msgstr "" @@ -5335,5 +5358,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 @@ -5342,5 +5365,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82 @@ -5421,13 +5444,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925 #: ../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:254 -#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 +#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 msgid "Add" msgstr "Legg til" @@ -5558,54 +5581,54 @@ #. item "Land use/Quarry" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173 #: build/trans_presets.java:3154 msgid "Relations" msgstr "Relasjoner" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Open a list of all relations." msgstr "Åpne en liste over alle relasjoner" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 #, java-format msgid "Relations: {0}" msgstr "Relasjoner: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265 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:305 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306 msgid "Delete the selected relation" msgstr "Slet valgt relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344 msgid "Create a new relation" msgstr "Oprett ny relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479 msgid "Download members" msgstr "" @@ -6940,58 +6963,58 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996 msgid "Please enter an integer value > 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74 msgid "Select changesets owned by specific users" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93 msgid "Select changesets depending on whether they are open or closed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112 msgid "" "Select changesets based on the date/time they have been created or closed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132 msgid "Select only changesets related to a specific bounding box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302 msgid "Query open changesets only" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311 msgid "Query closed changesets only" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320 msgid "Query both open and closed changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389 msgid "User ID: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409 msgid "User name: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445 msgid "Only changesets owned by myself" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457 msgid "Only changesets owned by the user with the following user ID" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475 msgid "Only changesets owned by the user with the following user name" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527 msgid "" "Can't restrict changeset query to the current user because the current user " @@ -6999,58 +7022,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533 #, java-format msgid "Current value ''{0}'' for user ID isn''t valid" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536 #, java-format msgid "Can''t restrict the changeset query to the user name ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553 msgid "Please enter a valid user ID" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554 msgid "Invalid user ID" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563 msgid "Please enter a non-empty user name" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564 msgid "Invalid user name" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720 msgid "Date: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684 msgid "Closed after - " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714 msgid "Created before - " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765 msgid "Only changesets closed after the following date/time" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786 msgid "Only changesets closed after and created before a specific date/time" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837 msgid "" "Can't build changeset query with time based restrictions. Input isn't valid." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865 msgid "" "Please enter valid date/time values to restrict
the query to a " @@ -7058,9 +7081,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868 msgid "Invalid date/time values" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942 msgid "" "Can''t restrict the changeset query to a specific bounding box. The input is " @@ -7068,5 +7091,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951 msgid "" "Please enter valid longitude/latitude values to restrict
the " @@ -7074,15 +7097,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954 msgid "Invalid bounding box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993 msgid "" "The current value isn't a valid user ID. Please enter an integer value > 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030 msgid "" "The current value isn't a valid user name.
Please enter an non-" @@ -7090,9 +7113,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033 msgid "Please enter an non-empty user name" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063 #, java-format msgid "" @@ -7101,5 +7124,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133 #, java-format msgid "" @@ -7126,9 +7149,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174 msgid "Basic" msgstr "Enkel" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52 -msgid "Download changesets using a predefined queries" +msgid "Download changesets using predefined queries" msgstr "" @@ -7138,5 +7162,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55 -msgid "Query changesets according to an URL of the OSM server" +msgid "Query changesets from a server URL" msgstr "" @@ -7147,5 +7171,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58 -msgid "Query changesets according to advanced query parameters" +msgid "Use a custom changeset query" msgstr "" @@ -7187,22 +7211,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69 -#, java-format -msgid "" -"Please enter or paste an URL to retrieve changesets from the OSM " -"API.

Examples

Note that changeset queries are currently " -"always submitted to ''{0}'', regardless of the host, port and path of the " -"URL entered beow." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70 +msgid "Please enter or paste an URL to retrieve changesets from the OSM API." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71 +msgid "Examples" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76 +#, java-format +msgid "" +"Note that changeset queries are currently always submitted to ''{0}'', " +"regardless of the host, port and path of the URL entered below." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181 msgid "This changeset query URL is invalid" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179 #, java-format msgid "This will change {0} object." @@ -7211,10 +7237,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517 @@ -7223,10 +7249,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361 msgid "Change values?" msgstr "Endre verdier?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294 #, java-format msgid "Change properties of up to {0} object" @@ -7235,5 +7261,5 @@ msgstr[1] "Endre egenskap på inntil {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334 #, java-format msgid "This will change up to {0} object." @@ -7242,9 +7268,9 @@ msgstr[1] "Dette vil endre opptil {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336 msgid "Please select a key" msgstr "Velg en nøkkel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349 msgid "Please select a value" msgstr "Velg en verdi" @@ -7272,61 +7298,57 @@ msgstr "Tilføy egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Egenskaper: {0} / Medlemskap: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816 msgid "Properties / Memberships" msgstr "Egenskaper / Medlemskap" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 msgid "Change relation" msgstr "Skift relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870 msgid "Delete from relation" msgstr "Slett fra relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Vil du slette utvalget fra relasjon {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893 msgid "Delete the selected key in all objects" msgstr "Fjern den valgte nøkkel i alle objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895 msgid "Delete Properties" msgstr "DSlett egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926 msgid "Add a new key/value pair to all objects" msgstr "Tilføy et nytt nøkkel/verdi-sett til alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938 msgid "Edit the value of the selected key for all objects" msgstr "Rett verdien for den valgte nøkkel for alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974 msgid "Select relation" -msgstr "Utvalg" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932 -#, fuzzy +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975 msgid "Select relation in main selection." -msgstr "Ingen relasjoner er valgt" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934 -#, fuzzy +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977 msgid "Select in relation list" -msgstr "Velg linjetegnings-innstillinger" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935 -#, fuzzy +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978 msgid "Select relation in relation list." -msgstr "Velg linjetegnings-innstillinger" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -7382,5 +7404,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" @@ -7394,12 +7416,12 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44 msgid "Download relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, java-format -msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80 +#, fuzzy, java-format +msgid "({0}/{1}): Downloading relation ''{2}''..." +msgstr "Laster ned programtillegg {0} …" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 @@ -8012,6 +8034,7 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -9068,6 +9091,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 #, java-format -msgid "There is {0} object to upload left." -msgid_plural "There are {0} objects to upload left." +msgid "There is {0} object left to upload." +msgid_plural "There are {0} objects left to upload." msgstr[0] "" msgstr[1] "" @@ -9153,9 +9176,8 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 #, java-format msgid "" "There are multiple changesets necessary in order to " -"upload {0} objects. What policy shall be used?" +"upload {0} objects. Which strategy do you want to use?" msgstr "" @@ -9177,4 +9199,11 @@ "Can''t upload {0} objects in one request because the
max. changeset " "size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What strategy do you want to use?" msgstr "" @@ -9612,24 +9641,24 @@ msgstr[1] "{0} punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "GPX Filer (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Fila {0} er lastet inn under navnet «{1}»" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188 #, java-format msgid "Error while parsing {0}" msgstr "Feil oppsto ved sending av {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197 #, java-format msgid "Could not read \"{0}\"" msgstr "Klarte ikke lese «{0}»" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -9640,34 +9669,34 @@ "
Skriv inn tidspunktet og velg tidssone
" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254 msgid "Photo time (from exif):" msgstr "Tidspunkt for foto (fra EXIF):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 msgid "Gps time (read from the above photo): " msgstr "Gps tidspunkt (lest i bildet ovenfor): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289 msgid "I'm in the timezone of: " msgstr "Jeg er i tidssonen: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388 msgid "No date" msgstr "Ingen dato" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362 msgid "Open an other photo" msgstr "Åpne et annet foto" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synkroniser tiden fra et bilde på GPS-mottakeren" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415 msgid "" "Error while parsing the date.\n" @@ -9677,114 +9706,116 @@ "Sjekk format" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "Invalid date" msgstr "Ugyldig dato" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467 msgid "GPX track: " msgstr "GPX-spor: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475 msgid "Open another GPX trace" msgstr "Åpne flere GPX-spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505 msgid "" "Use photo of an accurate clock,
e.g. GPS receiver display" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 msgid "Auto-Guess" msgstr "Automatisk forslag" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513 msgid "Manual adjust" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516 msgid "Override position for: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522 #, java-format msgid "Images with geo location in exif data ({0}/{1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525 #, java-format msgid "Images that are already tagged ({0}/{1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531 msgid "Show Thumbnail images on the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 msgid "Timezone: " msgstr "Tidssone: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567 msgid "Offset:" msgstr "Forskyvning:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646 msgid "No gpx selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710 msgid "Correlate images with GPX track" msgstr "Jevnfør bilder med GPX spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668 msgid "Correlate" msgstr "Jevnfør" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 msgid "Invalid timezone" msgstr "Ugyldig tidssone" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 msgid "Invalid offset" msgstr "Ugyldig forskyvning" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 msgid "Try Again" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712 msgid "No images could be matched!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861 #, java-format msgid "Timezone: {0}" msgstr "Tidssone: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862 #, java-format msgid "Minutes: {0}" msgstr "Minutter: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863 #, java-format msgid "Seconds: {0}" msgstr "Sekunder: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880 -#, java-format -msgid "
(Time difference of {0} days)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881 +#, java-format +msgid "(Time difference of {0} day)" +msgid_plural "Time difference of {0} days" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -9794,38 +9825,38 @@ "synkronisere bildene manuelt." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910 msgid "Matching photos to track failed" msgstr "Klarte ikke å koble foto til sporet" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926 msgid "Adjust timezone and offset" msgstr "Juster tidssone og forskyvning" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946 msgid "The selected photos don't contain time information." msgstr "Valgte foto har ikke tidskode." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947 msgid "Photos don't contain time information" msgstr "Foto har ikke tidskode." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "Valgte GPX spor mangler tidskode. Velg et annet spor." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976 msgid "GPX Track has no time information" msgstr "GPX sporet har ikke tidskoder" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071 msgid "You should select a GPX track" msgstr "Du bør velge et GPX-spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072 msgid "No selected GPX track" msgstr "Intgen GPX-spor er valgt" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245 #, java-format msgid "" @@ -9836,5 +9867,5 @@ "Forventet format: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315 #, java-format msgid "" @@ -9845,56 +9876,56 @@ "Forventet format: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104 msgid "Extracting GPS locations from EXIF" msgstr "Leser GPS posisjoner fra EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112 msgid "Starting directory scan" msgstr "Starter scanning av mapper" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125 msgid "Read photos..." msgstr "Les bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137 #, java-format msgid "Reading {0}..." msgstr "Leser {0} …" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Klarte ikke å lage fullstendig sti til mappa {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188 #, java-format msgid "Scanning directory {0}" msgstr "Scanner mappa {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193 #, java-format msgid "Found null file in directory {0}\n" msgstr "Fant tom fil i mappa {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Feil ved lesing av fil i mappa {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Geotaggede bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301 msgid "Correlate to GPX" msgstr "Juster til GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320 msgid "image" msgid_plural "images" @@ -9902,22 +9933,22 @@ msgstr[1] "bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321 #, java-format msgid "{0} were found to be gps tagged." msgstr "{0} hadde gps posisjon." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 -#, java-format -msgid "" -"

Delete the file {0} from disk?

The image file will be " -"permanently lost!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!

" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613 msgid "Image file could not be deleted." msgstr "" @@ -10108,4 +10139,582 @@ msgid "Illegal dash pattern, at least one value must be > 0" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233 +msgid "Access Token Key:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49 +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245 +msgid "Access Token Secret:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60 +msgid "Save Access Token in preferences" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62 +msgid "" +"Select to save the Access Token in the JOSM preferences.
Unselect " +"to use the Access Token in this JOSM session only." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49 +#, fuzzy +msgid "Use default settings" +msgstr "Bruk globale indstillinger." + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56 +msgid "Consumer Key:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67 +msgid "Consumer Secret:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78 +msgid "Request Token URL:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89 +msgid "Access Token URL:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236 +#, fuzzy +msgid "Autorise URL:" +msgstr "Opphavsmenn" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 +msgid "Click to reset the OAuth settings to default values" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131 +msgid "Click to abort resetting to the OAuth default values" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138 +msgid "" +"JOSM is about to reset the OAuth settings to default values.
The " +"current custom settings are not saved." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141 +msgid "Overwrite custom OAuth settings?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58 +msgid "Fully automatic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61 +msgid "Semi-automatic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64 +#, fuzzy +msgid "Manual" +msgstr "Kanal" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73 +msgid "" +"Run a fully automatic procedure to get an access token from the OSM " +"website.
JOSM accesses the OSM website on behalf of the JOSM user and " +"fully
automatically authorises the user and retrieves an Access Token." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80 +msgid "" +"Run a semi-automatic procedure to get an access token from the OSM " +"website.
JOSM submits the standards OAuth requests to get a Request Token " +"and an
Access Token. It dispatches the user to the OSM website in an " +"external browser
to authenticate itself and to accept the request token " +"submitted by JOSM." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88 +msgid "" +"Enter an Access Token manually if it was generated and retrieved " +"outside
of JOSM." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40 +#, fuzzy +msgid "Username: " +msgstr "Brukernavn" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54 +#, fuzzy +msgid "Password: " +msgstr "Passord" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175 +#, fuzzy +msgid "Granted rights" +msgstr "Roter med klokken" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176 +#, fuzzy +msgid "Advanced OAuth properties" +msgstr "Tilføy egenskaper" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357 +msgid "Accept Access Token" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237 +#, java-format +msgid "" +"You''ve sucessfully retrieved an OAuth Access Token from the OSM " +"website. Click on {0} to accept the token. JOSM will use it " +"in subsequent requests to gain access to the OSM API.The automatic process for retrieving an OAuth Access Token
from the " +"OSM server failed.

Please try again or choose another kind of " +"authorisation process,
i.e. semi-automatic or manual authorisation." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480 +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505 +#, fuzzy +msgid "OAuth authorisation failed" +msgstr "Klarte ikke starte API" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472 +msgid "" +"The automatic process for retrieving an OAuth Access Token
from the " +"OSM server failed because JOSM wasn't able to build
a valid login URL " +"from the OAuth Autorise Endpoint URL ''{0}''.

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

Please check username and password and try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57 +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141 +#, java-format +msgid "" +"Please enter an OAuth Access Token which is authorised to access " +"the OSM server ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99 +msgid "Save Access Token to preferences" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120 +#, fuzzy +msgid "Access Token" +msgstr "Adkomst" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121 +#, fuzzy +msgid "Advanced OAuth parameters" +msgstr "Avanserte innstillinger" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123 +msgid "Enter the OAuth Access Token" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124 +msgid "Enter advanced OAuth properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179 +#, fuzzy +msgid "Please enter an Access Token Key" +msgstr "Oppgi brukernavn" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181 +msgid "" +"The Access Token Key must not be empty. Please enter an Access Token Key" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199 +#, fuzzy +msgid "Please enter an Access Token Secret" +msgstr "Oppgi brukernavn" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201 +msgid "" +"The Access Token Secret must not be empty. Please enter an Access Token " +"Secret" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438 +msgid "Click to test the Access Token" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121 +#, fuzzy +msgid "Please select an authorisation procedure: " +msgstr "Velg minst én node eller linje." + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239 +#, fuzzy, java-format +msgid "Get an Access Token for ''{0}''" +msgstr "Fant ingen treff for «{0}»" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340 +#, fuzzy +msgid "Close the dialog and cancel authorisation" +msgstr "Steng dialog og avbryt nedlasting" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359 +#, fuzzy +msgid "Close the dialog and accept the Access Token" +msgstr "Lukk dialogen og opprett et nytt punkt." + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102 +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105 +msgid "Warning: failed to cancel running OAuth operation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129 +#, java-format +msgid "Retrieving OAuth Request Token from ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162 +#, java-format +msgid "Retrieving OAuth Access Token from ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299 +#, java-format +msgid "OSM website didn''t reply a session cookie in response to ''{0}''," +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350 +#, java-format +msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437 +#, java-format +msgid "Failed to autorise OAuth request ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484 +#, java-format +msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486 +msgid "Initializing a session at the OSM website..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492 +#, java-format +msgid "Authenticating the session for user ''{0}''..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498 +#, java-format +msgid "Authorising request token ''{0}''..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504 +#, java-format +msgid "Logging out session ''{0}''..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37 +msgid "Allow to upload map data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38 +msgid "Select to grant JOSM the right to upload map data on your behalf" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45 +msgid "Allow to upload GPS traces" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46 +msgid "Select to grant JOSM the right to upload GPS traces on your behalf" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53 +msgid "Allow to download your private GPS traces" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54 +msgid "" +"Select to grant JOSM the right to download your private GPS traces into JOSM " +"layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61 +#, fuzzy +msgid "Allow to read your preferences" +msgstr "Last opp innstillinger" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62 +msgid "Select to grant JOSM the right to read your server preferences" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69 +msgid "Allow to write your preferences" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70 +msgid "Select to grant JOSM the right to write your server preferences" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45 +msgid "Retrieving OAuth Access Token..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70 +#, java-format +msgid "Retrieving an OAuth Access Token from ''{0}'' failed." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73 +#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67 +#, fuzzy +msgid "Request Failed" +msgstr "Be op Oppdatering" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41 +msgid "Retrieving OAuth Request Token..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64 +#, java-format +msgid "Retrieving an OAuth Request Token from ''{0}'' failed." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82 +msgid "Display Advanced OAuth Parameters" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166 +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369 +msgid "Retrieve Request Token" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163 +#, fuzzy, java-format +msgid "" +"Please click on {0} to retrieve an OAuth Request " +"Token from ''{1}''." +msgstr "" +"Trykk {0} for å begynne sammenslåingen av lokal- og " +"tjeneroppføringer" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182 +msgid "Step 1/3: Retrieve an OAuth Request Token" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205 +msgid "Step 2/3: Authorise and retrieve an Access Token" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228 +msgid "Request Access Token" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220 +#, java-format +msgid "" +"JOSM successfully retrieved a Request Token. JOSM is now " +"launching an authorisation page in an external browser. Please login with " +"your OSM username and password and follow the instructions to authorise the " +"Request Token. Then switch back to this dialog and click on {0}

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

The access token is: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348 +#, fuzzy +msgid "Restart" +msgstr "Restaurant" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371 +#, fuzzy +msgid "Click to retrieve a Request Token" +msgstr "Klikk for å fjerne plassering" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402 +#, fuzzy +msgid "Retrieve Access Token" +msgstr "Redningsmøtepunkt" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404 +#, fuzzy +msgid "Click to retrieve an Access Token" +msgstr "Klikk for å fjerne plassering" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59 +msgid "Testing OAuth Access Token" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117 +#, java-format +msgid "Retrieving user details with Access Token Key ''{0}'' was rejected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120 +#, java-format +msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144 +#, java-format +msgid "" +"Successfully used the the Access Token ''{0}'' to
access the OSM " +"server at ''{1}''.
You''re accessing the OSM server as user ''{2}'' with " +"id ''{3}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154 +#, fuzzy +msgid "Success" +msgstr "Adkomst" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163 +#, java-format +msgid "" +"Failed to access the OSM server ''{0}''
with the Access Token " +"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"not
able to access any protected resource on this server using this token." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172 +#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209 +#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226 +#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242 +#, fuzzy +msgid "Test failed" +msgstr "Oppdatering feilet" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181 +#, java-format +msgid "" +"The AccessToken ''{1}'' is known to the OSM server ''{0}''.
The " +"test to retrieve the user details for this token failed, though." +"
Depending on what rights are granted to this token you may nevertheless " +"use it
to upload data, upload GPS traces, and/or access other protected " +"resources." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190 +msgid "Token allows restricted access" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199 +#, java-format +msgid "" +"Failed to retrieve information about the current userfrom the OSM " +"server ''{0}''.
This is probably not a problem caused by the tested " +"Access Token, but
rather a problem with the server configuration. " +"Carefully check the server
URL and your Internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218 +#, java-format +msgid "" +"Failed to sign the request for the OSM server ''{0}'' with the token " +"''{1}''.
The token ist probably invalid." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235 +msgid "" +"The test failed because the server responded with an internal error." +"
JOSM couldn''t decide whether the token is valid. Please try again later." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251 +#, fuzzy +msgid "Retrieving user info..." +msgstr "string;string;..." #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -10140,5 +10749,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 msgid "Please select the row to edit." @@ -10146,5 +10755,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196 #, java-format msgid "New value for {0}" @@ -10152,7 +10761,7 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103 msgid "Please select the row to delete." msgstr "Velg raden som skal slettes" @@ -10608,12 +11217,4 @@ msgstr "OSM-data" -#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27 -msgid "Keep backup files" -msgstr "Behold sikkerhetskopier" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32 -msgid "When saving, keep backup files ending with a ~" -msgstr "Lagre sikkerhetskopier med ~ i slutten av filnavnet." - #. Show splash screen on startup #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38 @@ -10652,17 +11253,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70 msgid "Look and Feel" msgstr "Utseende og opplevelse" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47 msgid "Language" msgstr "Språk" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113 -msgid "Looking up available translations..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108 msgid "Default (Auto determined)" msgstr "Standard (automatisk valgt)" @@ -10729,10 +11325,20 @@ msgstr "Indstilling på programtillegg sider" +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92 +#, fuzzy +msgid "Close the prefereces dialog and discard preference updates" +msgstr "Lukk dialogen og opprett et nytt punkt." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109 +#, fuzzy +msgid "Save the preferences and close the dialog" +msgstr "Avbryt konfliktløsning og lukk vinduet" + #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45 msgid "Display Settings" msgstr "Visningsinnstillinger" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45 msgid "" "Various settings that influence the visual representation of the whole " @@ -10742,29 +11348,29 @@ "prorammet." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46 msgid "Connection Settings" msgstr "Innstillinger for tilkobling" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46 msgid "Connection Settings for the OSM server." msgstr "Innstillinger for forbindelse til OSM-tjeneren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47 msgid "Map Settings" msgstr "Innstillinger for kart" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47 msgid "Settings for the map projection and data interpretation." msgstr "Innstilinger for kartprojeksjon og datafortolkning" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48 msgid "Audio Settings" msgstr "Lydinnstillinger" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48 msgid "Settings for the audio player and audio markers." msgstr "Innstillinger for avspilling av lyd og lyd markering." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108 msgid "You have to restart JOSM for some settings to take effect." msgstr "Du må starte JOSM for at enkelte innstillingene skal tre i kraft." @@ -10791,92 +11397,29 @@ msgstr "Klarte ikke bruke projeksjonen {0}. Bruker Mercators projeksjon." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144 -msgid "Host:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151 -msgctxt "server" -msgid "Port:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112 -msgid "" -"Please enter a username and a password if your proxy requires authentication." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127 -msgid "Password:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187 -msgid "No proxy" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200 -msgid "Use standard system settings" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 -msgid "" -"Use standard system settings (disabled. Start JOSM with -Djava.net." -"useSystemProxies=true to enable)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214 -msgid "Manually configure a HTTP proxy" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231 -msgid "Use a SOCKS proxy" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271 -msgid "" -"Warning: JOSM is configured to use proxies from the system setting, but the " -"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296 -msgid "Proxy Settings" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68 +#, fuzzy +msgid "Authentication" +msgstr "Attraksjon" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +#, fuzzy +msgid "Proxy settings" msgstr "Proxy Innstillinger" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 -msgid "The base URL for the OSM server (REST API)" -msgstr "URL-adressen for OSM-tjeneren (REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 -msgid "Login name (e-mail) to the OSM account." -msgstr "E-postadresse for OSM-kontoen" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Innloggings passord til OSM kontoen. La feltet være tomt for ikke å lagre " -"noen passord." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 -msgid "Base Server URL" -msgstr "URL-adresse til tjener" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 -msgid "OSM username (e-mail)" -msgstr "OSM-brukernavn (e-post)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 -msgid "OSM password" -msgstr "OSM passord" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" -"Advarsel: Passordet lagres i ren tekst i innstillingsfila." -"
Passordet overføres i ren tekst til tjeneren som del av URL-adressen." -"
Ikke bruk et verdifullt passord." +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70 +msgid "File backup" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71 +msgid "Configure your identity and how to authenticate at the OSM server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72 +msgid "Configure whether to use a proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73 +msgid "Configure whether to create backup files" +msgstr "" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -11171,4 +11714,252 @@ msgstr "Kombinasjonstast grupper:" +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51 +#, java-format +msgid "Testing OSM API URL ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60 +#, java-format +msgid "" +"''{0}'' isn't a valid OSM API URL.
Please check the spelling and " +"validate again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82 +msgid "Invalid API URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75 +#, java-format +msgid "" +"Failed to build URL ''{0}'' for validating the OSM API server." +"
Please check the spelling of ''{1}'' and validate again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91 +#, java-format +msgid "" +"Failed to connect to the URL ''{0}''.
Please check the spelling of " +"''{1}'' and your Internet connection and validate again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115 +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131 +#, fuzzy +msgid "Connection to API failed" +msgstr "Tilkobling mislykkes" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107 +#, java-format +msgid "" +"Failed to retrieve a list of changesets from the OSM API server " +"at
''{1}''. The server responded with the return code {0} instead of 200." +"
Please check the spelling of ''{1}'' and validate again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124 +#, java-format +msgid "" +"The OSM API server at ''{0}'' didn''t return a valid response.
It " +"is likely that ''{0}'' isn''t an OSM API server.
Please check the " +"spelling of ''{0}'' and validate again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59 +msgid "Use Basic Authentication" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60 +msgid "" +"Select to use HTTP basic authentication with your OSM username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67 +#, fuzzy +msgid "Use OAuth" +msgstr "Bruk standard" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68 +msgid "Select to use OAuth as authentication mechanism" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106 +#, java-format +msgid "" +"Warning: Unsupported value in preference ''{0}'', got {1}''. Using " +"authentication method ''Basic Authentication''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29 +msgid "Keep backup files" +msgstr "Behold sikkerhetskopier" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31 +msgid "When saving, keep backup files ending with a ~" +msgstr "Lagre sikkerhetskopier med ~ i slutten av filnavnet." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54 +#, fuzzy +msgid "OSM username:" +msgstr "OSM brukernavn (e-postadressen)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67 +#, fuzzy +msgid "OSM password:" +msgstr "OSM passord" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88 +#, fuzzy +msgid "" +"

Warning: The password " +"is stored in plain text in the JOSM preferences file. Furthermore, it is " +"transferred unencrypted in every request sent to the OSM " +"server. Do not use a valuable password.

" +msgstr "" +"Advarsel: Passordet lagres i ren tekst i innstillingsfila." +"
Passordet overføres i ren tekst til tjeneren som del av URL-adressen." +"
Ikke bruk et verdifullt passord." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112 +msgid "Warning: failed to retrieve OSM credentials from credential manager." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182 +#, java-format +msgid "Current credential manager is of type ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134 +msgid "Warning: failed to save OSM credentials to credential manager." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150 +msgid "Warning: Failed to retrieve OAuth Access Token from credential manager" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181 +msgid "Warning: Failed to store OAuth Access Token to credentials manager" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186 +msgid "" +"You don't have an Access Token yet to access the OSM server using OAuth. " +"Please authorise first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225 +msgid "You already have an Access Token to access the OSM server using OAuth." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257 +#, fuzzy +msgid "Save to preferences" +msgstr "Innstillinger" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 +msgid "Click to step through the OAuth authorisation process" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330 +msgid "New Access Token" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 +msgid "" +"Click to step through the OAuth authorisation process and generate a new " +"Access Token" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356 +msgid "Click test access to the OSM server with the current access token" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87 +#, fuzzy +msgid "OSM Server URL:" +msgstr "URL-adresse til tjener" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151 +msgid "Validate" +msgstr "Valider" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152 +msgid "Test the API URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168 +msgid "The API URL is valid." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173 +msgid "Validation failed. The API URL seems to be invalid." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234 +msgid "OSM API URL must not be empty. Please enter the OSM API URL." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238 +#, fuzzy +msgid "The current value isn't a valid URL" +msgstr "Nåværende verdi er standard." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240 +msgid "Please enter the OSM API URL." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158 +msgid "Host:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109 +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165 +msgctxt "server" +msgid "Port:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136 +msgid "Password:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 @@ -11312,5 +12103,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 #, java-format msgid "Failed to parse date ''{0}'' replied by server." @@ -11362,23 +12153,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 -#, java-format -msgid "" -"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " -"Proxy won't be used." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 -#, java-format -msgid "" -"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 -#, java-format -msgid "Warning: no preference ''{0}'' found. Will use no proxy." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86 +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91 +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105 +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122 +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134 +msgid "The proxy will not be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90 +#, java-format +msgid "Illegal port number in preference ''{0}''. Got {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104 +#, java-format +msgid "Warning: no preference ''{0}'' found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110 #, java-format msgid "" @@ -11387,16 +12184,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121 #, java-format msgid "" "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " -"''{1}''. Proxy won't be used" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +"''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133 #, java-format msgid "" "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " -"''{1}''. Proxy won't be used" +"''{1}''." msgstr "" @@ -11404,5 +12201,5 @@ #. somewhere else #. -#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144 #, java-format msgid "" @@ -11410,5 +12207,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153 msgid "" "Warning: the JVM is not configured to lookup proxies from the system " @@ -11647,5 +12444,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 #, java-format -msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgid "Preference ''{0}'' missing. Cannot initialize OsmApi." msgstr "" @@ -11689,5 +12486,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -11735,30 +12532,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 -msgid "Current changeset is null. Can't upload data." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638 +msgid "Current changeset is null. Cannot upload data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 #, java-format msgid "(Code={0})" msgstr "(Kode={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 #, java-format msgid "The server replied an error with code {0}." @@ -11923,4 +12720,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120 +msgid "" +"Failed to add an OAuth authentication header. There is currently no OAuth " +"Access Token configured." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126 +msgid "Failed to sign a HTTP connection with an OAuth Authentication header" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137 +#, fuzzy, java-format +msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''." +msgstr "Uventet verdi for parameter «index». Leste {0}." + #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 @@ -12217,23 +13029,28 @@ "Kunne ikke koble til OSM-tjeneren. Kontroller internett-tilkoblingen din." -#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48 +#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 msgid "XML tag is missing." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53 +#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43 +#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 #, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47 +#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92 -#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102 #, java-format msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127 +#, fuzzy +msgid "Reading user info ..." +msgstr "Leser {0} …" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 @@ -12616,5 +13433,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40 #, java-format msgid "" @@ -12623,5 +13440,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57 #, java-format msgid "" @@ -12631,5 +13448,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84 #, java-format msgid "" @@ -12641,5 +13458,30 @@ "datasett
bryter en forhåndsbetingelse.
Feilmelding:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 +#, java-format +msgid "" +"Authentication at the OSM server with the username ''{0}'' failed." +"
Please check the username and the password in the JOSM preferences." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102 +#, java-format +msgid "" +"Authentication at the OSM server with the OAuth token ''{0}'' failed." +"
Please launch the preferences dialog and retrieve another OAuth token." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112 +#, java-format +msgid "" +"Authorisation at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorised to access the protected resource
''{1}''." +"
Please launch the preferences dialog and retrieve another OAuth token." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148 #, java-format msgid "" @@ -12648,5 +13490,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154 #, java-format msgid "" @@ -12655,5 +13497,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163 #, java-format msgid "" @@ -12662,9 +13504,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 #, java-format msgid "" @@ -12673,5 +13515,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -12681,5 +13523,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -12688,5 +13530,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 #, java-format msgid "" @@ -12695,5 +13537,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273 #, java-format msgid "" @@ -12702,10 +13544,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290 msgid "" "The area you tried to download is too big or your request was too large." @@ -12714,10 +13556,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307 #, java-format msgid "" @@ -12728,5 +13570,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334 #, java-format msgid "" @@ -12736,5 +13578,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406 #, java-format msgid "" @@ -12745,18 +13587,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98 -msgid "Loading available locales..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102 -msgid "Checking locales..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105 -#, java-format -msgid "Checking translation for locale ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -12783,4 +13612,10 @@ "Warning: failed to derive wiki language prefix from JOSM locale code " "''{0}''. Using default code ''en''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40 +msgid "" +"Failed to open URL. There is currently no platform set. Please set a " +"platform first." msgstr "" @@ -13169,5 +14004,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416 msgid "Select Feuille" msgstr "" @@ -13218,5 +14053,11 @@ msgstr "Feil URL for lesing av Matrikkel." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 +msgid "" +"Cannot open a new client session.\n" +"Server in maintenance or temporary overloaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88 #, java-format msgid "" @@ -13225,25 +14066,23 @@ msgstr "" -#. this below is a temporary workaround to fix the "always on top" issue +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384 +msgid "Choose from..." +msgstr "Velg fra …" + #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 msgid "Select commune" msgstr "Velg kommune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 -msgid "Choose from..." -msgstr "Velg fra …" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149 msgid "Cadastre" msgstr "Matrikkel" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158 msgid "Auto sourcing" msgstr "Auto sourcing" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -13256,13 +14095,13 @@ "Vil du gjenopprette bruken av F11 til å laste ned bilder?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "Restore grab shortcut F11" msgstr "Gjenopprett F11-hurtigtast" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221 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:278 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283 #, java-format msgid "" @@ -13270,34 +14109,34 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 msgid "Replace original background by JOSM background color." msgstr "Bytt ut original bakgrunn med JOSM bakgrunnfarge." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 msgid "Reverse grey colors (for black backgrounds)." msgstr "Omvend grå farger (for svart bakgrunn)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 msgid "Set background transparent." msgstr "Sett backgrunn transparent." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37 msgid "Draw boundaries of downloaded data." msgstr "Vis grenser for nedlatede data." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "Enable automatic caching." msgstr "Aktiviser automatisk mellomlager." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 msgid "Max. cache size (in MB)" msgstr "Max. lager størrelse (i MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -13314,9 +14153,9 @@ "
før du laster inn data med dette programtillegget." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "French cadastre WMS" msgstr "Fransk cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -13324,10 +14163,10 @@ "html>" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 msgid "Source" msgstr "Kilde" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -13336,5 +14175,5 @@ "Bytt ut original hvit bacgrunn med fargen angitt i innstillingene for JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -13344,44 +14183,44 @@ "tekst på mørk bakgrunn." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104 msgid "Allows multiple layers stacking" msgstr "Tillat stabling av flere lag" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "Sett transperens på WMS lag. Høyre: opak, venstre: transparent." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Trekk et rektangel rundt data lastet ned fra WMS-tjener." #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Hent mindre bilder (høyere kvalitet men minnekrevende)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150 msgid "Fixed size square (default is 100m)" msgstr "Fast kvadrat størrelse (standard er 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Fast størrelse (fra 25 til 1000 meter)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -13495,5 +14334,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172 msgid "" "Click first corner for image cropping\n" @@ -13501,14 +14340,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192 msgid "Image cropping" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191 msgid "Click second corner for image cropping" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211 msgid "" "Click first Lambert crosspiece for georeferencing\n" @@ -13516,14 +14355,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231 msgid "Image georeferencing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230 msgid "Click second Lambert crosspiece for georeferencing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248 msgid "" "Do you want to cancel completely\n" @@ -13531,21 +14370,21 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264 msgid "Enter cadastre east,north position" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265 msgid "(Warning: verify north with arrow !!)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267 msgid "East" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268 msgid "North" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281 #, java-format msgid "Set {0} Lambert coordinates" @@ -13658,28 +14497,28 @@ msgstr "Blankt lag" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198 #, 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:193 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200 msgid "Is not vectorized." msgstr "Er ikke vektorisert" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201 #, java-format msgid "Raster size: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203 msgid "Is vectorized." msgstr "Er vektorisert" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204 #, java-format msgid "Commune bbox: {0}" msgstr "Kommune avgrensing: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406 #, java-format msgid "" @@ -13690,9 +14529,9 @@ "Create a new one." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407 msgid "Cache Format Error" msgstr "Feil i mellomlager format" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -13700,38 +14539,38 @@ "Lambert-sone {0} i hurtiglager ikke kompatibel med gjeldende Lambert-sone {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431 msgid "Cache Lambert Zone Error" msgstr "Feil Lambert sone på mellomlager" -#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67 +#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68 msgid "Use" msgstr "Bruk" -#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71 +#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72 msgid "Please select a scheme to use." msgstr "Velg en fargepalett" -#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81 +#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82 msgid "Color Scheme" msgstr "Fargepalett" -#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95 +#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96 msgid "Please select the scheme to delete." msgstr "Velg fargepalett for sletting" #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help.")); -#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107 +#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108 msgid "Use the selected scheme from the list." msgstr "Velg fargepalett i lista" -#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108 +#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109 msgid "Use the current colors as a new color scheme." msgstr "Lagre de brukte fargene i en ny farge palett." -#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109 +#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110 msgid "Delete the selected scheme from the list." msgstr "Fjern valgte palett fra lista." -#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111 +#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112 msgid "Color Schemes" msgstr "Farge Palett" @@ -13893,6 +14732,6 @@ #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125 msgid "Refresh" msgstr "Oppdater" @@ -14122,33 +14961,33 @@ msgstr "Det oppstod en ukjent feil" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19 msgid "east" msgstr "øst" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19 msgid "northeast" msgstr "nordøst" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19 msgid "north" msgstr "nord" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19 msgid "northwest" msgstr "nordvest" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20 msgid "west" msgstr "vest" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20 msgid "southwest" msgstr "sørvest" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20 msgid "south" msgstr "sør" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20 msgid "southeast" msgstr "sørøst" @@ -14188,5 +15027,5 @@ #. #. -#. +#. #. color water #. 1 @@ -14197,81 +15036,81 @@ #. #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2337 build/trans_style.java:961 -#: build/trans_style.java:978 build/trans_style.java:994 -#: build/trans_style.java:3415 build/trans_style.java:3423 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22 +#: build/trans_presets.java:2337 build/trans_style.java:967 +#: build/trans_style.java:984 build/trans_style.java:1000 +#: build/trans_style.java:3435 build/trans_style.java:3443 msgid "water" msgstr "vann" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22 msgid "coastline" msgstr "kystlinje" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22 msgid "land" msgstr "land" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41 msgid "Maximum number of segments per way" msgstr "Maksimalt antall segmenter per linje" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43 msgid "Maximum number of nodes in initial trace" msgstr "Maksimalt antall noder i første opptegning" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45 msgid "Maximum gray value to count as water (0-255)" msgstr "Max gråverdi for tolking som vann (0-255)" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47 msgid "Line simplification accuracy (degrees)" msgstr "Nøyaktighetsgrense for forenkling av linje (grader)" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49 msgid "Resolution of Landsat tiles (pixels per degree)" msgstr "Oppløsning på Landsat kartbilder (pixler pr grad)" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51 msgid "Size of Landsat tiles (pixels)" msgstr "Størrelsen på Landsat kartbilder (pixels)" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53 msgid "Shift all traces to east (degrees)" msgstr "Flytt alle spor mot øst (grader)" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55 msgid "Shift all traces to north (degrees)" msgstr "Flytt alle spor mot nord (grader)" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57 msgid "Direction to search for land" msgstr "Retning for søk etter land" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59 msgid "Tag ways as" msgstr "Egenskap for linjer" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61 msgid "WMS Layer" msgstr "WMS Lag" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63 msgid "Maximum cache size (MB)" msgstr "Max størrelse på mellomlager (MB)" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65 msgid "Maximum cache age (days)" msgstr "Max alder på mellomlager (dager)" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67 msgid "Source text" msgstr "Beskrivelse av kilde" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70 msgid "Maximum number of segments allowed in each generated way. Default 250." msgstr "" "Maksimalt antall segmenter tillatt i hver opptegnede linje. Standard er 250." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71 msgid "" "Maximum number of nodes to generate before bailing out (before simplifying " @@ -14280,5 +15119,5 @@ "Max antall Noder som genereres (før linjer forenkles).Standard er 50000." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be " @@ -14288,5 +15127,5 @@ "Kan være 0-255. Standard 90." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73 msgid "" "Accuracy of Douglas-Peucker line simplification, measured in degrees." @@ -14296,5 +15135,5 @@ "verdier gir flere noder og mer nøyaktige linjer. Standard er 0.0003." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74 msgid "" "Resolution of Landsat tiles, measured in pixels per degree. Default 4000." @@ -14303,21 +15142,21 @@ "4000." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75 msgid "Size of one landsat tile, measured in pixels. Default 2000." msgstr "Størrelsen på Landsat bilder i pixler. Standard: 2000" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76 msgid "Offset all points in East direction (degrees). Default 0." msgstr "Parallellflytt alle punkt mot øst (Grader). Standard: 0." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77 msgid "Offset all points in North direction (degrees). Default 0." msgstr "Parallellflytt alle punkt mot nord (Grader). Standard: 0." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78 msgid "Direction to search for land. Default east." msgstr "Retning for søk etter land. Standard: øst." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79 msgid "Tag ways as water, coastline, land or nothing. Default is water." msgstr "" @@ -14325,25 +15164,25 @@ "water." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80 msgid "Which WMS layer to use for tracing against. Default is IR1." msgstr "Hvilket WMS lag danner bakgrunn for vektorisering. Standard: IR1." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81 msgid "Maximum size of each cache directory in bytes. Default is 300MB" msgstr "Max størrelse på hver mappe for mellomlager i bytes. Standard: 300MB" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82 msgid "Maximum age of each cached file in days. Default is 100" msgstr "Max alder for hver fil i mellomlager i dager. Standard: 100" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83 msgid "Data source text. Default is Landsat." msgstr "Beskrivelse av datakilde. Standard: Landsat." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85 msgid "A plugin to trace water bodies on Landsat imagery." msgstr "Et tilleggsprogram for å vektorisere vannkant på Landsat bilder." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86 msgid "Lakewalker Plugin Preferences" msgstr "Innstillinger for Lakewalker tilleggsprogram" @@ -14553,5 +15392,5 @@ msgstr "OpenStreetBugs download-løkke" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112 msgid "Displays OpenStreetBugs issues" msgstr "Vis tema i OpenStreetBugs" @@ -14581,5 +15420,4 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125 #, java-format msgid "An error occurred: {0}" @@ -14594,14 +15432,22 @@ msgstr "Header inneholder flere verdier og kan ikke kobles til enkelt streng" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94 +msgid "Process queue" +msgstr "" + +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105 msgid "Open OpenStreetBugs" msgstr "Åpne OpenStreetBugs" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104 msgid "Opens the OpenStreetBugs window and activates the automatic download" msgstr "Åpner OpenStreetBugs-vinduet og starter automatisk nedlasting" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110 +msgid "Bug list" +msgstr "" + +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 msgid "" "The visible area is either too small or too big to download data from " @@ -14611,22 +15457,31 @@ "OpenStreetBugs" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178 +msgid "Queue" +msgstr "" + +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71 msgid "Add a comment" msgstr "Legg til en merknad" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72 msgid "Enter your comment" msgstr "Skriv inn din merknad" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89 +#, fuzzy +msgid "Comment: " +msgstr "Offentlig" + +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59 msgid "Mark as done" msgstr "Marker som utført" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72 msgid "Really close?" msgstr "Vil du virkelig lukke?" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73 msgid "" "Really mark this issue as ''done''?

You may add an optional " @@ -14636,23 +15491,51 @@ "inn tilleggskommentar:" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94 +#, fuzzy +msgid "Close: " +msgstr "Lukk" + +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54 msgid "New issue" msgstr "Ny feilrapport" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75 msgid "Create issue" msgstr "Oprett feilrapport" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76 msgid "Describe the problem precisely" msgstr "Beskriv problemet nøyaktig" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101 +#, fuzzy +msgid "Create: " +msgstr "Jevnfør" + +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96 msgid "Please enter a user name" msgstr "Oppgi brukernavn" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50 msgid "Unknown issue state" msgstr "Ukendt status for feilrapport" + +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22 +msgid "Switch to online mode" +msgstr "" + +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23 +msgid "Switch to offline mode" +msgstr "" + +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65 +msgid "You have unsaved changes in your queue. Do you want to submit them now?" +msgstr "" + +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66 +#, fuzzy +msgid "OpenStreetBugs" +msgstr "Åpne OpenStreetBugs" #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 @@ -14674,10 +15557,10 @@ msgstr "Ukjent filtype {0}" -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45 -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137 +#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46 +#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138 msgid "Osmarender" msgstr "Osmarender" -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99 +#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100 msgid "" "Firefox not found. Please set firefox executable in the Map Settings page of " @@ -14686,5 +15569,5 @@ "Fant ikke Firefox. Oppgi Firefox-programmet i siden for Kartinnstillinger." -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133 +#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134 msgid "Firefox executable" msgstr "Firefox-programfil" @@ -14694,37 +15577,37 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "load data from API" msgstr "last inn data fra API" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "create new objects" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "change the selection" msgstr "bytt utvalg" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30 msgid "change the viewport" msgstr "bytt arbeidsutsnitt" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 msgid "confirm all Remote Control actions manually" msgstr "Bekreft alle Remote control handlinger manuelt" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "Et programtillegg som tillater at JOSM blir styrt av et annet program" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36 msgid "Remote Control" msgstr "Remote Control" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36 msgid "Settings for the Remote Control plugin." msgstr "Remote Control tilleggsprogram innstillinger." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -14736,5 +15619,5 @@ "fjernstyring av tilleggsprogrammet." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42 msgid "Permitted actions" msgstr "Tillatte handlinger" @@ -14848,25 +15731,25 @@ msgstr "Slett rute" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86 msgid "Routing Plugin Preferences" msgstr "Innstillinger for Ruteplanlegger" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86 msgid "Configure routing preferences." msgstr "Oppsett for Ruteplanlegger" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91 msgid "Highway type" msgstr "Type ferdselsvei" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92 msgid "Speed (Km/h)" msgstr "Fart (Km/h)" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114 msgid "Weight" msgstr "Vekt" -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123 msgid "Enter weight values" msgstr "Gi verdier for vekting" @@ -14912,42 +15795,42 @@ msgstr "bilde " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37 msgid "autozoom" msgstr "Automatisk zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38 msgid "autoload tiles" msgstr "Last kartbilder automatisk" #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles."); -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48 msgid "SlippyMap" msgstr "SlippyMap" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48 msgid "Settings for the SlippyMap plugin." msgstr "Innstillinger for SlippyMap programtillegg." -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54 msgid "Tile Sources" msgstr "Kilder for kartbilder" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58 msgid "Auto zoom: " msgstr "Autozoom: " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62 msgid "Autoload Tiles: " msgstr "Automatisk leste kartbilder: " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66 msgid "Min zoom lvl: " msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70 msgid "Max zoom lvl: " msgstr "Max zoom niv: " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74 msgid "Fade background: " msgstr "Demp bakgrunn: " @@ -15183,37 +16066,37 @@ " {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73 msgid "Use ignore list." msgstr "Bruk Utelat Liste" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74 msgid "Use the ignore list to suppress warnings." msgstr "Bruk Utelat Liste for å undertrykke advarsler." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77 msgid "Use error layer." msgstr "Bruk Feil-Lag" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78 msgid "Use the error layer to display problematic elements." msgstr "Bruk Feil-Laget for å vise element som skaper problem." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81 msgid "Show informational level on upload." msgstr "Vir Informasjonsnivå ved opplasting" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82 msgid "Show the informational tests in the upload check windows." msgstr "Vis test av informasjon i vinduet som sjekker opplastingen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87 msgid "On demand" msgstr "Ved behov" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88 msgid "On upload" msgstr "Ved opplasting" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99 msgid "" "An OSM data validator that checks for common errors made by users and editor " @@ -15223,5 +16106,5 @@ "programmer." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100 msgid "Data validator" msgstr "Data-validator" @@ -15827,5 +16710,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4174 +#: build/trans_style.java:4235 msgid "building" msgstr "bygning" @@ -15839,5 +16722,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4181 +#: build/trans_style.java:4242 msgid "area" msgstr "område" @@ -16231,55 +17114,55 @@ msgstr "Åpne tomt WMS lag til data fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS Plugin Preferences" msgstr "Innstillinger WMS Programtillegg" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Rediger liste over WMS-tjenere som vises i WMS-programtillegg" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 msgid "Menu Name" msgstr "Meny Navn" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60 msgid "Menu Name (Default)" msgstr "Meny Navn (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60 msgid "WMS URL (Default)" msgstr "WMS URL (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89 msgid "Enter a menu name and WMS URL" msgstr "Gi meny navn og WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113 msgid "Copy Selected Default(s)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 msgid "Please select at least one row to copy." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165 msgid "Downloader:" msgstr "Nedlaster:" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 msgid "Overlap tiles" msgstr "Overlapp kartbilder" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 msgid "% of east:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174 msgid "% of north:" msgstr "" @@ -17846,6 +18729,6 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:547 -#: build/trans_style.java:555 +#: build/trans_presets.java:361 build/trans_style.java:553 +#: build/trans_style.java:561 msgid "motorway" msgstr "motorway" @@ -17871,6 +18754,6 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:563 -#: build/trans_style.java:571 +#: build/trans_presets.java:361 build/trans_style.java:569 +#: build/trans_style.java:577 msgid "trunk" msgstr "trunk" @@ -17896,6 +18779,6 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:579 -#: build/trans_style.java:587 +#: build/trans_presets.java:361 build/trans_style.java:585 +#: build/trans_style.java:593 msgid "primary" msgstr "riksvei" @@ -17921,6 +18804,6 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:595 -#: build/trans_style.java:603 +#: build/trans_presets.java:361 build/trans_style.java:601 +#: build/trans_style.java:609 msgid "secondary" msgstr "fylkesvei" @@ -17934,5 +18817,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:611 +#: build/trans_presets.java:361 build/trans_style.java:617 msgid "tertiary" msgstr "kommunevei" @@ -17950,5 +18833,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3175 +#: build/trans_presets.java:361 build/trans_style.java:3195 msgid "residential" msgstr "boligvei" @@ -17982,6 +18865,6 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4239 +#: build/trans_presets.java:361 build/trans_style.java:673 +#: build/trans_style.java:4300 msgid "service" msgstr "adkomstvei" @@ -18015,6 +18898,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:848 -#: build/trans_style.java:3240 build/trans_style.java:3241 +#: build/trans_presets.java:361 build/trans_style.java:854 +#: build/trans_style.java:3260 build/trans_style.java:3261 msgid "construction" msgstr "veiarbeid" @@ -18064,5 +18947,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:866 +#: build/trans_presets.java:423 build/trans_style.java:872 msgid "roundabout" msgstr "rundkjøring" @@ -19048,5 +19931,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3407 +#: build/trans_presets.java:1148 build/trans_style.java:3427 msgid "marsh" msgstr "Myrområde" @@ -20445,7 +21328,7 @@ #. #. -#: build/trans_presets.java:1724 build/trans_style.java:619 -#: build/trans_style.java:635 build/trans_style.java:651 -#: build/trans_style.java:659 +#: build/trans_presets.java:1724 build/trans_style.java:625 +#: build/trans_style.java:641 build/trans_style.java:657 +#: build/trans_style.java:665 msgid "street" msgstr "gate" @@ -21173,28 +22056,28 @@ #: build/trans_presets.java:1892 build/trans_presets.java:1901 #: build/trans_presets.java:1910 build/trans_presets.java:1919 -#: build/trans_style.java:3587 build/trans_style.java:3595 -#: build/trans_style.java:3603 build/trans_style.java:3611 -#: build/trans_style.java:3619 build/trans_style.java:3627 -#: build/trans_style.java:3635 build/trans_style.java:3643 -#: build/trans_style.java:3651 build/trans_style.java:3659 -#: build/trans_style.java:3667 build/trans_style.java:3675 -#: build/trans_style.java:3683 build/trans_style.java:3691 -#: build/trans_style.java:3699 build/trans_style.java:3707 -#: build/trans_style.java:3715 build/trans_style.java:3723 -#: build/trans_style.java:3731 build/trans_style.java:3739 -#: build/trans_style.java:3747 build/trans_style.java:3755 -#: build/trans_style.java:3763 build/trans_style.java:3771 -#: build/trans_style.java:3779 build/trans_style.java:3787 -#: build/trans_style.java:3795 build/trans_style.java:3803 -#: build/trans_style.java:3811 build/trans_style.java:3819 -#: build/trans_style.java:3827 build/trans_style.java:3835 -#: build/trans_style.java:3843 build/trans_style.java:3851 -#: build/trans_style.java:3859 build/trans_style.java:3867 -#: build/trans_style.java:3875 build/trans_style.java:3883 -#: build/trans_style.java:3891 build/trans_style.java:3899 -#: build/trans_style.java:3907 build/trans_style.java:3915 -#: build/trans_style.java:3923 build/trans_style.java:3931 -#: build/trans_style.java:3939 build/trans_style.java:3947 -#: build/trans_style.java:3955 +#: build/trans_style.java:3648 build/trans_style.java:3656 +#: build/trans_style.java:3664 build/trans_style.java:3672 +#: build/trans_style.java:3680 build/trans_style.java:3688 +#: build/trans_style.java:3696 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 build/trans_style.java:3736 +#: build/trans_style.java:3744 build/trans_style.java:3752 +#: build/trans_style.java:3760 build/trans_style.java:3768 +#: build/trans_style.java:3776 build/trans_style.java:3784 +#: build/trans_style.java:3792 build/trans_style.java:3800 +#: build/trans_style.java:3808 build/trans_style.java:3816 +#: build/trans_style.java:3824 build/trans_style.java:3832 +#: build/trans_style.java:3840 build/trans_style.java:3848 +#: build/trans_style.java:3856 build/trans_style.java:3864 +#: build/trans_style.java:3872 build/trans_style.java:3880 +#: build/trans_style.java:3888 build/trans_style.java:3896 +#: build/trans_style.java:3904 build/trans_style.java:3912 +#: build/trans_style.java:3920 build/trans_style.java:3928 +#: build/trans_style.java:3936 build/trans_style.java:3944 +#: build/trans_style.java:3952 build/trans_style.java:3960 +#: build/trans_style.java:3968 build/trans_style.java:3976 +#: build/trans_style.java:3984 build/trans_style.java:3992 +#: build/trans_style.java:4000 build/trans_style.java:4008 +#: build/trans_style.java:4016 msgid "sport" msgstr "sport" @@ -22889,4 +23772,12 @@ #. #. +#. color green +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color forest #. @@ -22921,9 +23812,9 @@ #. #. -#: build/trans_presets.java:2465 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3103 -#: build/trans_style.java:3111 build/trans_style.java:3159 -#: build/trans_style.java:3167 build/trans_style.java:3265 -#: build/trans_style.java:3273 +#: build/trans_presets.java:2465 build/trans_style.java:3100 +#: build/trans_style.java:3108 build/trans_style.java:3116 +#: build/trans_style.java:3124 build/trans_style.java:3132 +#: build/trans_style.java:3179 build/trans_style.java:3187 +#: build/trans_style.java:3285 build/trans_style.java:3293 msgid "green" msgstr "grønn" @@ -24331,7 +25222,7 @@ #. #: build/trans_presets.java:3189 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:877 -#: build/trans_style.java:885 build/trans_style.java:893 -#: build/trans_style.java:901 build/trans_style.java:909 +#: build/trans_style.java:689 build/trans_style.java:883 +#: build/trans_style.java:891 build/trans_style.java:899 +#: build/trans_style.java:907 build/trans_style.java:915 msgid "bicycle" msgstr "sykkel" @@ -24401,7 +25292,7 @@ #. #: build/trans_presets.java:3189 build/trans_style.java:247 -#: build/trans_style.java:691 build/trans_style.java:699 -#: build/trans_style.java:707 build/trans_style.java:708 -#: build/trans_style.java:716 +#: build/trans_style.java:697 build/trans_style.java:705 +#: build/trans_style.java:713 build/trans_style.java:714 +#: build/trans_style.java:722 msgid "foot" msgstr "fotgjenger" @@ -24427,5 +25318,5 @@ #. #. -#: build/trans_presets.java:3189 build/trans_style.java:1161 +#: build/trans_presets.java:3189 build/trans_style.java:1167 msgid "subway" msgstr "T-bane" @@ -24721,5 +25612,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:3969 +#: build/trans_style.java:633 build/trans_style.java:4030 msgid "deprecated" msgstr "uønsket" @@ -24761,5 +25652,5 @@ #. #. -#: build/trans_style.java:275 build/trans_style.java:675 +#: build/trans_style.java:275 build/trans_style.java:681 msgid "horse" msgstr "hest" @@ -24869,4 +25760,10 @@ #. #. +#. +#. +#. +#. 1 +#. 50000 +#. #. #. @@ -24904,5 +25801,5 @@ #. #. -#. +#. #. color barrier #. color barrier @@ -24975,11 +25872,11 @@ #. #. color barrier -#: build/trans_style.java:382 build/trans_style.java:395 -#: build/trans_style.java:396 build/trans_style.java:415 -#: build/trans_style.java:416 build/trans_style.java:435 -#: build/trans_style.java:436 build/trans_style.java:443 -#: build/trans_style.java:456 build/trans_style.java:457 -#: build/trans_style.java:470 build/trans_style.java:471 -#: build/trans_style.java:484 build/trans_style.java:485 +#: build/trans_style.java:388 build/trans_style.java:401 +#: build/trans_style.java:402 build/trans_style.java:421 +#: build/trans_style.java:422 build/trans_style.java:441 +#: build/trans_style.java:442 build/trans_style.java:449 +#: build/trans_style.java:462 build/trans_style.java:463 +#: build/trans_style.java:476 build/trans_style.java:477 +#: build/trans_style.java:490 build/trans_style.java:491 msgid "barrier" msgstr "hinder" @@ -25042,5 +25939,5 @@ #. #. -#: build/trans_style.java:542 +#: build/trans_style.java:548 msgid "motorroad" msgstr "" @@ -25096,7 +25993,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:919 -#: build/trans_style.java:927 build/trans_style.java:935 -#: build/trans_style.java:943 build/trans_style.java:951 +#: build/trans_style.java:649 build/trans_style.java:925 +#: build/trans_style.java:933 build/trans_style.java:941 +#: build/trans_style.java:949 build/trans_style.java:957 msgid "highway_track" msgstr "ferdselsvei – traktorvei" @@ -25167,9 +26064,9 @@ #. #. -#: build/trans_style.java:724 build/trans_style.java:1135 -#: build/trans_style.java:1199 build/trans_style.java:1207 -#: build/trans_style.java:1216 build/trans_style.java:1224 -#: build/trans_style.java:1232 build/trans_style.java:1233 -#: build/trans_style.java:1240 +#: build/trans_style.java:730 build/trans_style.java:1141 +#: build/trans_style.java:1205 build/trans_style.java:1213 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1238 build/trans_style.java:1239 +#: build/trans_style.java:1246 msgid "rail" msgstr "jernbane" @@ -25261,5 +26158,5 @@ #. #. -#: build/trans_style.java:810 +#: build/trans_style.java:816 msgid "services" msgstr "service" @@ -25273,5 +26170,5 @@ #. #. -#: build/trans_style.java:818 +#: build/trans_style.java:824 msgid "ford" msgstr "vadested" @@ -25292,10 +26189,10 @@ #. #. -#: build/trans_style.java:833 +#: build/trans_style.java:839 msgid "turningcircle" msgstr "vendesirkel" #. color construction -#. +#. #. 1 #. 50000 @@ -25305,5 +26202,5 @@ #. #. -#: build/trans_style.java:857 +#: build/trans_style.java:863 msgid "emergency_access_point" msgstr "redningsmøtepunkt" @@ -25318,5 +26215,5 @@ #. #. color riverbank -#: build/trans_style.java:969 build/trans_style.java:970 +#: build/trans_style.java:975 build/trans_style.java:976 msgid "riverbank" msgstr "elvebredd" @@ -25330,5 +26227,5 @@ #. #. -#: build/trans_style.java:986 +#: build/trans_style.java:992 msgid "stream" msgstr "bekk" @@ -25342,5 +26239,5 @@ #. #. -#: build/trans_style.java:1002 +#: build/trans_style.java:1008 msgid "dock" msgstr "tørrdokk" @@ -25529,13 +26426,13 @@ #. #. -#: build/trans_style.java:1025 build/trans_style.java:1054 -#: build/trans_style.java:1062 build/trans_style.java:1063 -#: build/trans_style.java:1071 build/trans_style.java:1548 -#: build/trans_style.java:1555 build/trans_style.java:1564 -#: build/trans_style.java:1572 build/trans_style.java:1604 -#: build/trans_style.java:1612 build/trans_style.java:1620 -#: build/trans_style.java:1628 build/trans_style.java:1635 -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 +#: build/trans_style.java:1031 build/trans_style.java:1060 +#: build/trans_style.java:1068 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1554 +#: build/trans_style.java:1561 build/trans_style.java:1570 +#: build/trans_style.java:1578 build/trans_style.java:1610 +#: build/trans_style.java:1618 build/trans_style.java:1626 +#: build/trans_style.java:1634 build/trans_style.java:1641 +#: build/trans_style.java:1650 build/trans_style.java:1658 +#: build/trans_style.java:1666 build/trans_style.java:1674 msgid "manmade" msgstr "menneskeskapt" @@ -25597,7 +26494,7 @@ #. #. -#: build/trans_style.java:1081 build/trans_style.java:1096 -#: build/trans_style.java:1111 build/trans_style.java:1119 -#: build/trans_style.java:1127 +#: build/trans_style.java:1087 build/trans_style.java:1102 +#: build/trans_style.java:1117 build/trans_style.java:1125 +#: build/trans_style.java:1133 msgid "railwaypoint" msgstr "jernbanepunkt" @@ -25620,10 +26517,10 @@ #. #. -#: build/trans_style.java:1144 build/trans_style.java:1153 +#: build/trans_style.java:1150 build/trans_style.java:1159 msgid "otherrail" msgstr "annen bane" #. color otherrail -#: build/trans_style.java:1145 +#: build/trans_style.java:1151 msgid "railover" msgstr "jernbanebro" @@ -25659,7 +26556,7 @@ #. #. color oldrail -#: build/trans_style.java:1169 build/trans_style.java:1179 -#: build/trans_style.java:1180 build/trans_style.java:1190 -#: build/trans_style.java:1191 +#: build/trans_style.java:1175 build/trans_style.java:1185 +#: build/trans_style.java:1186 build/trans_style.java:1196 +#: build/trans_style.java:1197 msgid "oldrail" msgstr "nedlagt bane" @@ -25705,6 +26602,6 @@ #. #. -#: build/trans_style.java:1271 build/trans_style.java:1272 -#: build/trans_style.java:1304 +#: build/trans_style.java:1277 build/trans_style.java:1278 +#: build/trans_style.java:1310 msgid "aeroway" msgstr "aeroway" @@ -25718,5 +26615,5 @@ #. #. -#: build/trans_style.java:1280 +#: build/trans_style.java:1286 msgid "terminal" msgstr "stasjon" @@ -25738,5 +26635,5 @@ #. #. -#: build/trans_style.java:1288 build/trans_style.java:1296 +#: build/trans_style.java:1294 build/trans_style.java:1302 msgid "aeroway_dark" msgstr "aeroway_dark" @@ -25750,5 +26647,5 @@ #. #. -#: build/trans_style.java:1312 +#: build/trans_style.java:1318 msgid "aeroway_light" msgstr "aeroway_light" @@ -25810,7 +26707,7 @@ #. #. -#: build/trans_style.java:1336 build/trans_style.java:1344 -#: build/trans_style.java:1352 build/trans_style.java:1360 -#: build/trans_style.java:1368 +#: build/trans_style.java:1342 build/trans_style.java:1350 +#: build/trans_style.java:1358 build/trans_style.java:1366 +#: build/trans_style.java:1374 msgid "aerialway" msgstr "aerialway" @@ -25827,5 +26724,5 @@ #. #. color piste_easy -#: build/trans_style.java:1378 build/trans_style.java:1379 +#: build/trans_style.java:1384 build/trans_style.java:1385 msgid "piste_easy" msgstr "nedfart enkel" @@ -25840,5 +26737,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1387 build/trans_style.java:1388 +#: build/trans_style.java:1393 build/trans_style.java:1394 msgid "piste_intermediate" msgstr "nedfart middels" @@ -25853,5 +26750,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1396 build/trans_style.java:1397 +#: build/trans_style.java:1402 build/trans_style.java:1403 msgid "piste_advanced" msgstr "nedfart avansert" @@ -25866,5 +26763,5 @@ #. #. color piste_expert -#: build/trans_style.java:1405 build/trans_style.java:1406 +#: build/trans_style.java:1411 build/trans_style.java:1412 msgid "piste_expert" msgstr "nedfart ekspert" @@ -25879,5 +26776,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1414 build/trans_style.java:1415 +#: build/trans_style.java:1420 build/trans_style.java:1421 msgid "piste_freeride" msgstr "nedfart friløp" @@ -25892,5 +26789,5 @@ #. #. color piste_novice -#: build/trans_style.java:1423 build/trans_style.java:1424 +#: build/trans_style.java:1429 build/trans_style.java:1430 msgid "piste_novice" msgstr "nedfart nybegynner" @@ -26010,11 +26907,11 @@ #. #. -#: build/trans_style.java:1435 build/trans_style.java:1449 -#: build/trans_style.java:1457 build/trans_style.java:1466 -#: build/trans_style.java:1474 build/trans_style.java:1482 -#: build/trans_style.java:1490 build/trans_style.java:1498 -#: build/trans_style.java:1506 build/trans_style.java:1514 -#: build/trans_style.java:1522 build/trans_style.java:1530 -#: build/trans_style.java:1538 +#: build/trans_style.java:1441 build/trans_style.java:1455 +#: build/trans_style.java:1463 build/trans_style.java:1472 +#: build/trans_style.java:1480 build/trans_style.java:1488 +#: build/trans_style.java:1496 build/trans_style.java:1504 +#: build/trans_style.java:1512 build/trans_style.java:1520 +#: build/trans_style.java:1528 build/trans_style.java:1536 +#: build/trans_style.java:1544 msgid "power" msgstr "kraft" @@ -26028,5 +26925,5 @@ #. #. color pier -#: build/trans_style.java:1579 build/trans_style.java:1580 +#: build/trans_style.java:1585 build/trans_style.java:1586 msgid "pier" msgstr "brygge" @@ -26040,5 +26937,5 @@ #. #. -#: build/trans_style.java:1588 +#: build/trans_style.java:1594 msgid "pipeline" msgstr "rørgate" @@ -26182,13 +27079,13 @@ #. #. -#: build/trans_style.java:1678 build/trans_style.java:1686 -#: build/trans_style.java:1694 build/trans_style.java:1702 -#: build/trans_style.java:1710 build/trans_style.java:1718 -#: build/trans_style.java:1734 build/trans_style.java:1742 -#: build/trans_style.java:1750 build/trans_style.java:1758 -#: build/trans_style.java:1766 build/trans_style.java:1774 -#: build/trans_style.java:1782 build/trans_style.java:1790 -#: build/trans_style.java:1798 build/trans_style.java:1806 -#: build/trans_style.java:1814 +#: build/trans_style.java:1684 build/trans_style.java:1692 +#: build/trans_style.java:1700 build/trans_style.java:1708 +#: build/trans_style.java:1716 build/trans_style.java:1724 +#: build/trans_style.java:1740 build/trans_style.java:1748 +#: build/trans_style.java:1756 build/trans_style.java:1764 +#: build/trans_style.java:1772 build/trans_style.java:1780 +#: build/trans_style.java:1788 build/trans_style.java:1796 +#: build/trans_style.java:1804 build/trans_style.java:1812 +#: build/trans_style.java:1820 msgid "leisure" msgstr "fritid" @@ -26202,5 +27099,5 @@ #. #. -#: build/trans_style.java:1726 +#: build/trans_style.java:1732 msgid "marina" msgstr "marina" @@ -26296,10 +27193,10 @@ #. #. -#: build/trans_style.java:1824 build/trans_style.java:1832 -#: build/trans_style.java:1840 build/trans_style.java:1848 -#: build/trans_style.java:1856 build/trans_style.java:1864 -#: build/trans_style.java:1872 build/trans_style.java:1880 -#: build/trans_style.java:1888 build/trans_style.java:1896 -#: build/trans_style.java:1904 +#: build/trans_style.java:1830 build/trans_style.java:1838 +#: build/trans_style.java:1846 build/trans_style.java:1854 +#: build/trans_style.java:1862 build/trans_style.java:1870 +#: build/trans_style.java:1878 build/trans_style.java:1886 +#: build/trans_style.java:1894 build/trans_style.java:1902 +#: build/trans_style.java:1910 msgid "amenity" msgstr "fasilitet" @@ -26401,14 +27298,21 @@ #. #. -#: build/trans_style.java:1912 build/trans_style.java:1920 -#: build/trans_style.java:1928 build/trans_style.java:1936 -#: build/trans_style.java:1944 build/trans_style.java:1952 -#: build/trans_style.java:1960 build/trans_style.java:1968 -#: build/trans_style.java:1976 build/trans_style.java:1983 -#: build/trans_style.java:1992 build/trans_style.java:2000 +#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1934 build/trans_style.java:1942 +#: build/trans_style.java:1950 build/trans_style.java:1958 +#: build/trans_style.java:1966 build/trans_style.java:1974 +#: build/trans_style.java:1982 build/trans_style.java:1989 +#: build/trans_style.java:1998 build/trans_style.java:2006 msgid "amenity_traffic" msgstr "fasilitet – trafikk" #. color amenity_traffic +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -26804,5 +27708,5 @@ #. #. color amenity_light -#. +#. #. 1 #. 50000 @@ -26827,23 +27731,23 @@ #. #. -#: build/trans_style.java:2008 build/trans_style.java:2023 -#: build/trans_style.java:2031 build/trans_style.java:2039 -#: build/trans_style.java:2054 build/trans_style.java:2062 -#: build/trans_style.java:2070 build/trans_style.java:2078 -#: build/trans_style.java:2193 build/trans_style.java:2201 -#: build/trans_style.java:2208 build/trans_style.java:2217 -#: build/trans_style.java:2225 build/trans_style.java:2233 -#: build/trans_style.java:2241 build/trans_style.java:2249 -#: build/trans_style.java:2257 build/trans_style.java:2265 -#: build/trans_style.java:2328 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2353 -#: build/trans_style.java:2361 build/trans_style.java:2368 -#: build/trans_style.java:2376 build/trans_style.java:2384 -#: build/trans_style.java:2392 build/trans_style.java:2400 -#: build/trans_style.java:2408 build/trans_style.java:2416 -#: build/trans_style.java:2424 build/trans_style.java:2432 -#: build/trans_style.java:2440 build/trans_style.java:2448 -#: build/trans_style.java:2456 build/trans_style.java:2464 -#: build/trans_style.java:2473 build/trans_style.java:2488 +#: build/trans_style.java:2021 build/trans_style.java:2036 +#: build/trans_style.java:2044 build/trans_style.java:2052 +#: build/trans_style.java:2067 build/trans_style.java:2075 +#: build/trans_style.java:2083 build/trans_style.java:2091 +#: build/trans_style.java:2206 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2230 +#: build/trans_style.java:2238 build/trans_style.java:2246 +#: build/trans_style.java:2254 build/trans_style.java:2262 +#: build/trans_style.java:2270 build/trans_style.java:2278 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2366 +#: build/trans_style.java:2374 build/trans_style.java:2381 +#: build/trans_style.java:2389 build/trans_style.java:2397 +#: build/trans_style.java:2405 build/trans_style.java:2413 +#: build/trans_style.java:2421 build/trans_style.java:2429 +#: build/trans_style.java:2437 build/trans_style.java:2445 +#: build/trans_style.java:2453 build/trans_style.java:2461 +#: build/trans_style.java:2469 build/trans_style.java:2477 +#: build/trans_style.java:2486 build/trans_style.java:2501 msgid "amenity_light" msgstr "fasilitet – lys" @@ -26875,6 +27779,6 @@ #. #. -#: build/trans_style.java:2086 build/trans_style.java:2094 -#: build/trans_style.java:3326 +#: build/trans_style.java:2099 build/trans_style.java:2107 +#: build/trans_style.java:3346 msgid "light_water" msgstr "light_vann" @@ -26935,8 +27839,8 @@ #. #. -#: build/trans_style.java:2272 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2297 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 +#: build/trans_style.java:2285 build/trans_style.java:2293 +#: build/trans_style.java:2301 build/trans_style.java:2310 +#: build/trans_style.java:2317 build/trans_style.java:2325 +#: build/trans_style.java:2333 msgid "health" msgstr "helse" @@ -27289,26 +28193,26 @@ #. #. -#: build/trans_style.java:2498 build/trans_style.java:2506 -#: build/trans_style.java:2514 build/trans_style.java:2522 -#: build/trans_style.java:2530 build/trans_style.java:2538 -#: build/trans_style.java:2546 build/trans_style.java:2554 -#: build/trans_style.java:2562 build/trans_style.java:2570 -#: build/trans_style.java:2578 build/trans_style.java:2586 -#: build/trans_style.java:2594 build/trans_style.java:2602 -#: build/trans_style.java:2610 build/trans_style.java:2618 -#: build/trans_style.java:2626 build/trans_style.java:2634 -#: build/trans_style.java:2642 build/trans_style.java:2650 -#: build/trans_style.java:2658 build/trans_style.java:2666 -#: build/trans_style.java:2674 build/trans_style.java:2682 -#: build/trans_style.java:2690 build/trans_style.java:2698 -#: build/trans_style.java:2706 build/trans_style.java:2714 -#: build/trans_style.java:2722 build/trans_style.java:2730 -#: build/trans_style.java:2738 build/trans_style.java:2746 -#: build/trans_style.java:2754 build/trans_style.java:2762 -#: build/trans_style.java:2770 build/trans_style.java:2778 -#: build/trans_style.java:2786 build/trans_style.java:2794 -#: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2818 build/trans_style.java:2826 -#: build/trans_style.java:2835 +#: build/trans_style.java:2511 build/trans_style.java:2519 +#: build/trans_style.java:2527 build/trans_style.java:2535 +#: build/trans_style.java:2543 build/trans_style.java:2551 +#: build/trans_style.java:2559 build/trans_style.java:2567 +#: build/trans_style.java:2575 build/trans_style.java:2583 +#: build/trans_style.java:2591 build/trans_style.java:2599 +#: build/trans_style.java:2607 build/trans_style.java:2615 +#: build/trans_style.java:2623 build/trans_style.java:2631 +#: build/trans_style.java:2639 build/trans_style.java:2647 +#: build/trans_style.java:2655 build/trans_style.java:2663 +#: build/trans_style.java:2671 build/trans_style.java:2679 +#: build/trans_style.java:2687 build/trans_style.java:2695 +#: build/trans_style.java:2703 build/trans_style.java:2711 +#: build/trans_style.java:2719 build/trans_style.java:2727 +#: build/trans_style.java:2735 build/trans_style.java:2743 +#: build/trans_style.java:2751 build/trans_style.java:2759 +#: build/trans_style.java:2767 build/trans_style.java:2775 +#: build/trans_style.java:2783 build/trans_style.java:2791 +#: build/trans_style.java:2799 build/trans_style.java:2807 +#: build/trans_style.java:2815 build/trans_style.java:2823 +#: build/trans_style.java:2831 build/trans_style.java:2839 +#: build/trans_style.java:2848 msgid "shop" msgstr "butikk" @@ -27380,8 +28284,8 @@ #. #. -#: build/trans_style.java:2845 build/trans_style.java:2853 -#: build/trans_style.java:2861 build/trans_style.java:2869 -#: build/trans_style.java:2877 build/trans_style.java:2885 -#: build/trans_style.java:2893 build/trans_style.java:2901 +#: build/trans_style.java:2858 build/trans_style.java:2866 +#: build/trans_style.java:2874 build/trans_style.java:2882 +#: build/trans_style.java:2890 build/trans_style.java:2898 +#: build/trans_style.java:2906 build/trans_style.java:2914 msgid "hotel" msgstr "hotell" @@ -27452,5 +28356,5 @@ #. #. -#. +#. #. 1 #. 40000 @@ -27459,5 +28363,5 @@ #. #. -#. +#. #. color tourism #. 1 @@ -27467,5 +28371,5 @@ #. #. -#. +#. #. 1 #. 40000 @@ -27474,5 +28378,5 @@ #. #. -#. +#. #. 1 #. 40000 @@ -27482,9 +28386,9 @@ #. #. -#: build/trans_style.java:2909 build/trans_style.java:2917 -#: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2941 build/trans_style.java:2949 -#: build/trans_style.java:2950 build/trans_style.java:2958 -#: build/trans_style.java:2974 build/trans_style.java:2996 +#: build/trans_style.java:2922 build/trans_style.java:2930 +#: build/trans_style.java:2938 build/trans_style.java:2946 +#: build/trans_style.java:2954 build/trans_style.java:2962 +#: build/trans_style.java:2963 build/trans_style.java:2971 +#: build/trans_style.java:2987 build/trans_style.java:3009 msgid "tourism" msgstr "turisme" @@ -27572,14 +28476,13 @@ #. #. -#: build/trans_style.java:3006 build/trans_style.java:3014 -#: build/trans_style.java:3022 build/trans_style.java:3030 -#: build/trans_style.java:3038 build/trans_style.java:3046 -#: build/trans_style.java:3054 build/trans_style.java:3062 -#: build/trans_style.java:3070 build/trans_style.java:3078 +#: build/trans_style.java:3019 build/trans_style.java:3027 +#: build/trans_style.java:3035 build/trans_style.java:3043 +#: build/trans_style.java:3051 build/trans_style.java:3059 +#: build/trans_style.java:3067 build/trans_style.java:3075 +#: build/trans_style.java:3083 build/trans_style.java:3091 msgid "historic" msgstr "historisk" #. color green -#. #. 1 #. 50000 @@ -27588,5 +28491,5 @@ #. #. -#: build/trans_style.java:3119 +#: build/trans_style.java:3139 msgid "quarry" msgstr "steinbrudd" @@ -27600,5 +28503,5 @@ #. #. -#: build/trans_style.java:3127 +#: build/trans_style.java:3147 msgid "landfill" msgstr "avfallsdeponi" @@ -27620,5 +28523,5 @@ #. #. -#: build/trans_style.java:3135 build/trans_style.java:3143 +#: build/trans_style.java:3155 build/trans_style.java:3163 msgid "basin" msgstr "vannmagasin" @@ -27632,5 +28535,5 @@ #. #. -#: build/trans_style.java:3151 +#: build/trans_style.java:3171 msgid "forest" msgstr "skog" @@ -27644,5 +28547,5 @@ #. #. -#: build/trans_style.java:3183 +#: build/trans_style.java:3203 msgid "farmyard" msgstr "gårdstun" @@ -27665,5 +28568,5 @@ #. #. -#: build/trans_style.java:3192 build/trans_style.java:3200 +#: build/trans_style.java:3212 build/trans_style.java:3220 msgid "retail" msgstr "butikker" @@ -27677,5 +28580,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3228 msgid "industrial" msgstr "industri" @@ -27689,5 +28592,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3236 msgid "brownfield" msgstr "rivningsområde" @@ -27701,5 +28604,5 @@ #. #. -#: build/trans_style.java:3224 +#: build/trans_style.java:3244 msgid "greenfield" msgstr "byggeområde" @@ -27713,5 +28616,5 @@ #. #. -#: build/trans_style.java:3232 +#: build/trans_style.java:3252 msgid "railland" msgstr "jernbanegrunn" @@ -27768,7 +28671,7 @@ #. #. -#: build/trans_style.java:3249 build/trans_style.java:3284 -#: build/trans_style.java:3292 build/trans_style.java:3300 -#: build/trans_style.java:3308 build/trans_style.java:3316 +#: build/trans_style.java:3269 build/trans_style.java:3304 +#: build/trans_style.java:3312 build/trans_style.java:3320 +#: build/trans_style.java:3328 build/trans_style.java:3336 msgid "military" msgstr "millitært" @@ -27782,5 +28685,5 @@ #. #. -#: build/trans_style.java:3257 +#: build/trans_style.java:3277 msgid "cemetery" msgstr "gravlund" @@ -27793,5 +28696,5 @@ #. #. -#: build/trans_style.java:3333 +#: build/trans_style.java:3353 msgid "peak" msgstr "fjelltopp" @@ -27806,5 +28709,5 @@ #. #. -#: build/trans_style.java:3342 +#: build/trans_style.java:3362 msgid "glacier" msgstr "isbre" @@ -27818,5 +28721,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3370 msgid "volcano" msgstr "vulkan" @@ -27871,8 +28774,8 @@ #. #. -#: build/trans_style.java:3358 build/trans_style.java:3359 -#: build/trans_style.java:3367 build/trans_style.java:3383 -#: build/trans_style.java:3447 build/trans_style.java:3455 -#: build/trans_style.java:3463 +#: build/trans_style.java:3378 build/trans_style.java:3379 +#: build/trans_style.java:3387 build/trans_style.java:3403 +#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3483 msgid "natural" msgstr "natur" @@ -27886,5 +28789,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3395 msgid "scrub" msgstr "krattskog" @@ -27898,5 +28801,5 @@ #. #. -#: build/trans_style.java:3391 +#: build/trans_style.java:3411 msgid "heath" msgstr "beiteområde" @@ -27910,5 +28813,5 @@ #. #. -#: build/trans_style.java:3399 +#: build/trans_style.java:3419 msgid "woodarea" msgstr "" @@ -27922,5 +28825,5 @@ #. #. -#: build/trans_style.java:3431 +#: build/trans_style.java:3451 msgid "mud" msgstr "søle" @@ -27934,5 +28837,5 @@ #. #. -#: build/trans_style.java:3439 +#: build/trans_style.java:3459 msgid "beach" msgstr "strand" @@ -28010,8 +28913,8 @@ #. #. -#: build/trans_style.java:3479 build/trans_style.java:3487 -#: build/trans_style.java:3495 build/trans_style.java:3503 -#: build/trans_style.java:3511 build/trans_style.java:3519 -#: build/trans_style.java:3527 build/trans_style.java:3535 +#: build/trans_style.java:3499 build/trans_style.java:3507 +#: build/trans_style.java:3515 build/trans_style.java:3523 +#: build/trans_style.java:3531 build/trans_style.java:3539 +#: build/trans_style.java:3547 build/trans_style.java:3555 msgid "route" msgstr "rute" @@ -28034,4 +28937,45 @@ #. #. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. #. #. color boundary @@ -28059,7 +29003,12 @@ #. #. -#: build/trans_style.java:3545 build/trans_style.java:3553 -#: build/trans_style.java:3561 build/trans_style.java:3569 -#: build/trans_style.java:3577 +#: build/trans_style.java:3565 build/trans_style.java:3573 +#: build/trans_style.java:3577 build/trans_style.java:3581 +#: build/trans_style.java:3585 build/trans_style.java:3589 +#: build/trans_style.java:3593 build/trans_style.java:3597 +#: build/trans_style.java:3601 build/trans_style.java:3605 +#: build/trans_style.java:3609 build/trans_style.java:3614 +#: build/trans_style.java:3622 build/trans_style.java:3630 +#: build/trans_style.java:3638 msgid "boundary" msgstr "grense" @@ -28209,11 +29158,11 @@ #. #. -#: build/trans_style.java:4017 build/trans_style.java:4025 -#: build/trans_style.java:4033 build/trans_style.java:4041 -#: build/trans_style.java:4049 build/trans_style.java:4057 -#: build/trans_style.java:4065 build/trans_style.java:4073 -#: build/trans_style.java:4081 build/trans_style.java:4089 -#: build/trans_style.java:4097 build/trans_style.java:4105 -#: build/trans_style.java:4113 +#: build/trans_style.java:4078 build/trans_style.java:4086 +#: build/trans_style.java:4094 build/trans_style.java:4102 +#: build/trans_style.java:4110 build/trans_style.java:4118 +#: build/trans_style.java:4126 build/trans_style.java:4134 +#: build/trans_style.java:4142 build/trans_style.java:4150 +#: build/trans_style.java:4158 build/trans_style.java:4166 +#: build/trans_style.java:4174 msgid "place" msgstr "sted" @@ -28261,6 +29210,6 @@ #. #. -#: build/trans_style.java:4202 build/trans_style.java:4209 -#: build/trans_style.java:4216 build/trans_style.java:4223 +#: build/trans_style.java:4263 build/trans_style.java:4270 +#: build/trans_style.java:4277 build/trans_style.java:4284 msgid "address" msgstr "adresse" @@ -28616,4 +29565,19 @@ msgstr "" +#~ msgid "The base URL for the OSM server (REST API)" +#~ msgstr "URL-adressen for OSM-tjeneren (REST API)" + +#~ msgid "Login name (e-mail) to the OSM account." +#~ msgstr "E-postadresse for OSM-kontoen" + +#~ msgid "" +#~ "Login password to the OSM account. Leave blank to not store any password." +#~ msgstr "" +#~ "Innloggings passord til OSM kontoen. La feltet være tomt for ikke å lagre " +#~ "noen passord." + +#~ msgid "OSM username (e-mail)" +#~ msgstr "OSM-brukernavn (e-post)" + #~ msgid "Move" #~ msgstr "Flytt" @@ -28868,7 +29832,4 @@ #~ 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 "" @@ -29085,7 +30046,4 @@ #~ msgstr "osmarender-indstillinger" -#~ msgid "Request Update" -#~ msgstr "Be op Oppdatering" - #~ msgid "requested: {0}" #~ msgstr "bestilt: {0}" @@ -29135,7 +30093,4 @@ #~ 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." @@ -29315,7 +30270,4 @@ #~ msgstr "Bare én node er valgt" -#~ msgid "Update failed" -#~ msgstr "Oppdatering feilet" - #~ msgid "Update Data" #~ msgstr "Oppdater data" @@ -29388,7 +30340,4 @@ #~ 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"