Index: applications/editors/josm/i18n/po/sv.po =================================================================== --- applications/editors/josm/i18n/po/sv.po (revision 18975) +++ applications/editors/josm/i18n/po/sv.po (revision 19199) @@ -4,9 +4,10 @@ # FIRST AUTHOR , 2006. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" "PO-Revision-Date: 2009-11-17 18:09+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,38 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:19+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:31+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Skapar huvudgränssnittet" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Hjälp" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Hoppar över felaktig URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -59,21 +60,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -94,17 +95,8 @@ msgstr "Varning" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Hoppar över felaktig URL till en fil: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Kunde inte läsa filen ''{0}''.
Felet är:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -112,8 +104,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Kunde inte läsa filen ''{0}''.
Felet är:
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -121,10 +122,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -136,9 +137,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -147,6 +149,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -201,8 +203,8 @@ #: ../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:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -270,5 +272,5 @@ msgstr "Om JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -279,5 +281,5 @@ "sidorna kommer antagligen inte att fungera. API URL:en är \"{0}\"." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -288,5 +290,5 @@ "antagligen inte att fungera. API URL:en är \"{0}\"." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -295,15 +297,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Fortsätt" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -312,29 +319,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -351,5 +359,9 @@ msgstr "Avbryt" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +msgid "Click to abort launching external browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Välj åtminstonde en redan upladdad nod, väg eller relation" @@ -365,5 +377,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Sammanfoga" @@ -383,15 +395,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Lägg till nod..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Lägg till en nod genom att ange latitud och longitud." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -407,22 +419,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Redigera: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Ange den nya nodens koordinater." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Använd decimalgrader." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negativa värden avser västra/södra halvklotet." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -431,5 +443,5 @@ msgstr "Latitud" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -438,28 +450,29 @@ msgstr "Longitud" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../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:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -471,9 +484,9 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "" @@ -494,18 +507,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -517,5 +530,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -537,6 +550,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -583,5 +596,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" @@ -618,14 +631,15 @@ msgstr "Det finns inte några konflikter att zooma till" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "Avsluta påbörjade changesets" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "Avslutar påbörjade changesets" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -635,21 +649,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Arkiv: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "Inga changesets är påbörjade" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "Inga påbörjade changesets" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "Laddar ner påbörjade changesets..." @@ -736,11 +750,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../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:201 +#: ../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 @@ -819,16 +834,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -864,5 +884,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Duplicera" @@ -905,10 +925,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Exportera till GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Exportera data till en GPX-fil" @@ -923,12 +943,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -953,8 +973,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -965,10 +985,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -981,17 +1001,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1028,22 +1048,27 @@ msgstr "Visa objektinformation om OSM noder, vägar eller relationer." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Förena överlappande ytor" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "Förena ytor som överlappar varandra" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Välj åtminstone en sluten väg som skall förenas." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "För närvarande kan enbart upp till två ytor förenas." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "\"{0}\" är inte sluten, och kan därför inte förenas med andra ytor." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1057,38 +1082,34 @@ "Är du säker på att du vill fortsätta?" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Avbryt om du är osäker" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "Välj åtminstone en sluten väg som skall förenas." - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "La till nod vid alla korsande sträckor" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Ta bort sträckor som inte är del av en inre multipolygon" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "Korrigera relationer" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "Slog ihop område som låg ovanpå sig själv" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "Slog ihop områden som låg ovanpå varandra" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1098,33 +1119,33 @@ "att det inte har uppstått några fel." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Ange värden för alla konflikter" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Jämka konflikter" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "Korrigera taggkonflikter" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "Tog bort element från relation" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "Slå ihop områden: Ta bort korta sträckor" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "Sluten sträcka" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "Ta bort taggar från inre sträckor" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "" @@ -1288,5 +1309,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Kan inte flytta objekt utanför världen." @@ -1366,28 +1387,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Räta upp form" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Flytta noder så att alla vinklar är 90 eller 270 grader" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1396,9 +1417,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1410,16 +1431,16 @@ "denna varning.
Vill du fortsätta?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "Räta upp" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "Användning" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "Räta upp" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1494,18 +1515,18 @@ msgstr "Kunde inte döpa om filen ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Ändra riktning på sträckor" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Ändra riktningen på alla valda sträckor." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Välj åtminstone en sträcka." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Ändra riktning på sträckor" @@ -1514,10 +1535,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Spara" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Spara nuvarande data." @@ -1574,10 +1595,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Spara som..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Spara nuvarande data i en ny fil." @@ -1621,6 +1642,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1655,5 +1675,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1718,5 +1738,5 @@ "sträckan.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1724,5 +1744,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1730,5 +1750,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1762,34 +1782,34 @@ msgstr "Denna nod är inte bunden till något annat." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Ingen av dessa noder hänger ihop med någonting annat." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Ingen av noderna på denna sträcka är knuten till något annat." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "Det nuvarande urvalet kan inte användas för att frigöra något." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Välj antingen:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* En nod med tagg, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* En nod som används av mer än en sträcka, eller" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "* One node that is used by more than one way and one of those ways, or" +msgstr "" +"* En nod som används av mer än en sträcka samt en av dessa sträckor, eller" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 -msgid "* One node that is used by more than one way and one of those ways, or" -msgstr "" -"* En nod som används av mer än en sträcka samt en av dessa sträckor, eller" - -#: ../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" @@ -1798,5 +1818,5 @@ "eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1805,5 +1825,5 @@ "sträcka." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1818,9 +1838,9 @@ "få sina egna kopior och alla noder kommer att vara valda." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Frigjord nod" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1828,5 +1848,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1861,10 +1881,10 @@ msgstr "Avmarkera allt (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Uppdatera data" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1872,53 +1892,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "Inget dataset kunde hittas" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Uppdatera markering" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Tom markering" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1927,5 +1943,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1933,136 +1949,7 @@ msgstr "Det finns inte några ändringar att skicka in." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Det finns inte någonting att skicka in. Skaffa lite data först." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Synkronisera hela datasetet" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" -"Uppladdning misslyckadesav någon av dina noder, vägar eller relationer.

Klicka på " -"{0} för att synkronisera all lokal data med servern." -"
Klicka på {1} för att avbryta och fortsätta redigera." -"
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "Uppdaterar primitiv" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2197,9 +2084,9 @@ msgstr "Hämtade GPX-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Hämtar data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2207,5 +2094,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "" @@ -2281,7 +2168,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2298,58 +2185,52 @@ "noder vid borttagning av sträcka. Ctrl: ta bort objekt som refererar hit" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Rita" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Rita noder" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "markerad" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Det går inte att lägga till en nod utanför världen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Lägg till nod" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Lägg till en nod till sträckan" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Knyt en existerande nod till en sträcka" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Lägg till en ny nod i en befintlig sträcka" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Lägg till en nod i en sträcka och bind ihop" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Skapa ny nod" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Markera nod under pekare." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2358,14 +2239,14 @@ msgstr[1] "Infoga ny nod i {0} vägar." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Starta ny väg från senaste nod." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Fortsätt väg från senaste nod." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Avsluta ritning." @@ -2406,18 +2287,19 @@ "därifrån; SKIFT-släpp för att synkronisera ljud vid den punkten." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Markera" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Välj, flytta och rotera objekt." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2426,17 +2308,17 @@ msgstr[1] "Lägg till och flytta en virtuell ny nod till {0} vägar." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Flytta element" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Flytta" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Ångra flytt" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2446,13 +2328,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Släpp musknappen för att välja objekten i rektangeln." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2461,9 +2343,9 @@ "nod." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Släpp musknappen för att sluta rotera." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2475,5 +2357,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Zooma:" @@ -2497,5 +2379,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Sök efter objekt." @@ -2589,7 +2471,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:... - alla objekt som ändrats av användare..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2598,8 +2479,18 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "nodes:... - objekt med givent antal noder" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "nodes:... - objekt med givent antal noder" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2607,35 +2498,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified - alla ändrade objekt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - alla valda objekt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - alla ofullständiga objekt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "otaggade - alla otaggede objekt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "Använd | eller OR för att kombinera med logiskt ELLER" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2643,11 +2540,11 @@ "innehåller :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Använd ( och ) för att gruppera uttryck" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2655,55 +2552,55 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Sök" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Påbörja sökning" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "Inga sökträffar för ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Urvalet utökades inte genom att söka efter ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Urvalet begränsades inte genom att söka efter ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "{0} sökträffar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2717,40 +2614,43 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "Det saknas argument för eller (or)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "Det saknas argument för inte (not)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "En avslutande parentes förväntades" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "Det saknas argument för eller (or)." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2759,9 +2659,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "Felaktigt antal parametrar för nodoperator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2770,7 +2670,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "" @@ -2804,44 +2709,30 @@ msgstr "Fel under kommunikation med servern." -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"Antal ändringar överskrider det maximala antalet ändringar, antal ändringar " -"är {0}, max är {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" +"{0} noder i väg {1} överskrider det maximala antalet tillåtna noder {2}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "Bryter mot API:ns möjligheter" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, fuzzy, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" -"VARNING: trunkerar automatiskt värde för tagg \"{0}\" på borttagen primitiv " -"{1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, fuzzy, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" -"Längd på värde för tagg \"{0}\" på primitiv {1} överskrider det max. " -"tillåtna längden ({2}). Värdets längd är {3}." - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "" -"{0} noder i väg {1} överskrider det maximala antalet tillåtna noder {2}" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2953,5 +2844,5 @@ msgstr "Sätt {0}={1} för {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2966,5 +2857,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "" @@ -3065,4 +2956,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3174,5 +3080,5 @@ msgstr "Tillämpa?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3256,15 +3162,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "Fel i konfigurationsfilen på raderna {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3273,5 +3179,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3280,5 +3186,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3287,5 +3193,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3294,5 +3200,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3300,5 +3206,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3307,5 +3213,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3314,5 +3220,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3321,5 +3227,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3328,10 +3234,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3339,24 +3245,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Inställningar lagrade på {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Kunde inte skicka in inställningar. Orsak: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Kunde inte hämta inställningar från server." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3365,5 +3271,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3392,5 +3298,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3412,31 +3318,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "V" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "Ö" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3444,5 +3343,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3453,27 +3352,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3481,5 +3380,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3491,5 +3390,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3497,25 +3396,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text +msgid "Text" +msgstr "" + +#. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 -msgid "Text" -msgstr "" - -#. column header: apply filter for children +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3523,43 +3422,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "Parameter {0} > 0 krävs. Erhöll {1}." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3567,5 +3478,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3593,10 +3504,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3604,7 +3511,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3619,5 +3526,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3635,146 +3542,138 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "En sträcka för en yta är inte sluten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "Multipolygonsträckan ''{0}'' är inte sluten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Tog bort medlemmen ''{0}'' i relationen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Sträcka \"{0} med mindre än två punkter." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "Det finns mer än en \"från\"-sträcka." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "Det finns mer än en \"till\"-sträcka." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "Mer än en \"via\" hittades." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Okänd roll ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Okänd medlemstyp för ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "Det finns inte någon \"från\"-sträcka." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "Det finns inte någon \"till\"-sträcka." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "Ingen nod eller sträcka för \"via\" hittades." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "\"Från\"-sträckan startar eller slutar inte i en \"via\"-nod." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Sträckan \"till\" börjar eller slutar inte i en \"via\"-nod." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Sträckan \"från\" börjar eller slutar inte i en \"via\"-nod." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Sträckan \"till\" börjar eller slutar inte i \"via\"-sträckan." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "Stil för restriktion {0} kunde inte hittas." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersektionen mellan sträckorna ''{0}'' och ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Den inre sträckan ''{0}'' befinner sig utanför." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Ingen användbar roll ''{0}'' för sträckan ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Icke-sträcka ''{0}'' i multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Multipolygonen ''{0}'' saknar yttre sträcka." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Stil för inre väg ''{0}'' är samma som multipolygonen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Stil för yttre väg ''{0}'' passar inte." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "otaggade" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "text" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Fel: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Varning: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "inaktiv" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "markerad" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3783,6 +3682,6 @@ msgstr[1] "noder" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3791,7 +3690,8 @@ msgstr[1] "sträckor" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3800,21 +3700,37 @@ msgstr[1] "relationer" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "otaggade sträcka" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "ofullständig sträcka" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "bakgrund" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "framhäv" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "otaggade" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "text" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -3956,5 +3872,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "järnväg" @@ -3970,7 +3886,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3986,4 +3902,10 @@ msgstr[1] "{0} medlemmar" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -4015,6 +3937,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Konflikt" @@ -4028,7 +3950,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4113,74 +4035,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Användarnamn" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Lösenord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "användning" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "alternativ" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Visa denna hjälptext" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "Standard unix-geometri-argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Hämta hem området inom gränsvärdena" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Hämta platsen som anges i url:en (med lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Öppna fil (som rå gps, om .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Hämta området innanför gränsvärden som rå gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "Gör urval med angivet sökkriterium" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "Öppna i maximerat läge" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Återställ inställningarna till förval" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Ange språk" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4189,9 +4111,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "exempel" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4201,36 +4123,36 @@ "data innan --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "Istället för --download= kan du använda osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Aktiverar uppdaterade insticksmoduler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Hämtar tidiga insticksmoduler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Anger förval" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Hämtar insticksmoduler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Arkiv" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4245,22 +4167,22 @@ msgstr "Redigera" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Visa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Verktyg" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Snabbval" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4268,5 +4190,5 @@ msgstr "Meny: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Ljud" @@ -4345,13 +4267,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "lagret finns inte i listan." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4384,5 +4307,5 @@ msgstr "Initierar" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4390,6 +4313,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4398,5 +4321,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4405,5 +4328,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4412,25 +4335,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4438,9 +4361,9 @@ msgstr "Roll" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4472,11 +4395,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4485,6 +4408,6 @@ msgstr "Taggar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4492,6 +4415,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4499,40 +4422,40 @@ msgstr "Medlemmar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4540,21 +4463,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" @@ -4586,22 +4509,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4609,5 +4532,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4615,30 +4538,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4646,5 +4569,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4652,14 +4575,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4667,5 +4590,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4673,23 +4596,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4700,27 +4623,27 @@ msgstr "Ta bort" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 +msgid "Unfreeze" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 -msgid "Unfreeze" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4729,5 +4652,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4736,5 +4659,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4743,5 +4666,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4750,5 +4673,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4757,5 +4680,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4765,5 +4688,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -5000,10 +4923,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -5013,10 +4936,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5101,9 +5024,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../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 @@ -5111,6 +5034,6 @@ msgstr "inget" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "alla" @@ -5199,7 +5122,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5209,6 +5132,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5316,4 +5239,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Ta bort valda objekt." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Ändra värden?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +msgid "Open the list of changesets in the current layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Hämta" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Hämta kartdata från OSM-servern." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Avslutar påbörjade changesets" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Öppna en redigerare för den valda relationen" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5327,12 +5302,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5350,19 +5325,19 @@ msgstr "Kommandolista: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Jämka" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" "Öppna en sammanfogningsdialog med alla de valda posterna från listan ovan." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5370,25 +5345,25 @@ msgstr "Sätt urval av element på kartan till de valda posterna i listan ovan." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5400,26 +5375,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../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:255 +#: ../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 @@ -5430,41 +5405,41 @@ msgstr "Lägg till" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5503,5 +5478,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5516,34 +5491,34 @@ msgstr "Öppna en lista av alla inlästa lager." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Ta bort valt lager." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Visa/Dölj" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Alternera visning av det valda lagret." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Flytta det valda lagret en rad upp." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Flytta det valda lagret en rad ner." @@ -5553,5 +5528,177 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relationer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Öppna en lista över alla relationer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Relationer: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Öppna en redigerare för den valda relationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Ta bort den valda relationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Skapa en ny relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Aktuellt urval" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Öppna en urvalslista" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Zooma till valda objekt" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Zooma till urval" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Urval: Rel.:{0}/Sträckor:{1}/Noder:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Markering" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Urval: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Lossa panelen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Stäng denna panel. Du kan öppna den igen med hjälp av knapparna i den " +"vänstra verktygraden." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Klicka för att minimera/maximera panelens innehåll" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Upphovsmän" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Öppna en lista över de som arbetar med de valda objekten." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Upphovsman" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# objekt" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "ofullständig" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "slutenväg" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Laddar ner påbörjade changesets..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5560,22 +5707,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Ändra värden?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5584,5 +5731,5 @@ msgstr[1] "Ändra egenskaper för upp till {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5591,228 +5738,71 @@ msgstr[1] "Detta kommer att ändra upp till {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Välj en nyckel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Välj ett värde" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "Välj de objekt vars egenskaper du vill ändra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Egenskaper/Roller" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Egenskaper för valda objekt." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Medlem av" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Lägg till egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Egenskaper: {0} / Medlemskap: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Egenskaper / Roller" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Ändra relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Ta bort från relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Verkligen ta bort det valda från relation {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Ta bort den valda nyckeln från alla objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Ta bort egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Lägg till ett nytt nyckel/värde-par till alla objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Redigera värdet av den valda nyckeln för alla objekt." - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relationer" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Öppna en lista över alla relationer" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Relationer: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Öppna en redigerare för den valda relationen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Ta bort den valda relationen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Skapa en ny relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Aktuellt urval" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Öppna en urvalslista" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Zooma till valda objekt" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Zooma till urval" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Urval: Rel.:{0}/Sträckor:{1}/Noder:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Markering" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Urval: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Lossa panelen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Stäng denna panel. Du kan öppna den igen med hjälp av knapparna i den " -"vänstra verktygraden." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Klicka för att minimera/maximera panelens innehåll" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Upphovsmän" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Öppna en lista över de som arbetar med de valda objekten." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Upphovsman" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# objekt" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5874,14 +5864,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Hämta alla ofullständiga sträckor och noder i relationen" -msgstr[1] "Hämta alla ofullständiga sträckor och noder i relationen" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Hämta plats" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 @@ -5904,14 +5893,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Tillämpa snabbval" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Öppna en redigerare för den valda relationen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5920,14 +5907,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5937,9 +5924,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5949,15 +5936,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5965,5 +5952,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5971,20 +5958,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -5993,70 +5980,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Sport" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 msgid "Move the currently selected members up" msgstr "Flytta vald medlem/valda medlemmar uppåt" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 msgid "Move the currently selected members down" msgstr "Flytta vald medlem/valda medlemmar nedåt" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6065,9 +6051,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6076,48 +6062,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Hämta alla ofullständiga sträckor och noder i relationen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Hämta medlemmar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6127,34 +6112,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 +msgid "Zoom to" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6266,10 +6251,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6279,5 +6264,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6363,9 +6348,4 @@ msgid "Download Area" msgstr "Hämta område" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Hämta" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6665,6 +6645,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6677,6 +6655,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6947,4 +6923,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7167,5 +7147,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7208,116 +7188,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Namn" @@ -7341,15 +7321,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Typ" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7520,10 +7500,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7531,5 +7511,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7537,9 +7517,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7654,6 +7634,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "okänd" @@ -7675,13 +7655,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7716,4 +7696,121 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Synkronisera hela datasetet" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"Uppladdning misslyckadesav någon av dina noder, vägar eller relationer.

Klicka på " +"{0} för att synkronisera all lokal data med servern." +"
Klicka på {1} för att avbryta och fortsätta redigera." +"
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Ge en kort kommentar till de ändringar som du skickar in:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7732,39 +7829,147 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Skicka in ändringar" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Stänger ändringssamling..." + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +msgid "Upload data to an already existing and open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Spara användare och lösenord (okrypterat)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Ange ett användarnamn" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +msgid "Please enter the password name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Varning: Lösenordet skickas okrypterat." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Friidrott" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Ändra relation" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7831,17 +8036,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7854,9 +8059,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7870,9 +8075,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7887,50 +8092,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Kassera och avsluta" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7938,5 +8143,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -8009,40 +8214,374 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "Inställningar" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +msgid "Advanced" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Ställ in tillgängliga insticksmoduler." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Okänd roll ''{0}''." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Skicka in ändringar" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "Om" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +msgid "Click to abort uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../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." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +msgid "Changeset is full" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Välj vilken rad du vill ta bort." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../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?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"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:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Nya objekt:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Ändrade objekt:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Borttagna objekt:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8051,5 +8590,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8058,5 +8597,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8065,208 +8604,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Skicka in ändringar" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Ange först önskade koordinater." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Ge en kort kommentar till de ändringar som du skickar in:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -msgid "Upload data in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -msgid "(1 request)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} meter" -msgstr[1] "{0} meter" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Ange ett användarnamn" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "gps-punkt" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Anpassa linjeritning" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Använd globala inställningar" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Rita linjer mellan punkter i detta lager." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Rita inte linjer mellan punkter i detta lager." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Välj alternativ för linjeritning" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8274,5 +8642,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8281,5 +8649,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8361,5 +8729,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Beskrivning" @@ -8391,10 +8759,10 @@ msgstr[1] "{0} sträckpunkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Omvandla till datalager" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8404,12 +8772,12 @@ "skicka in spår, se här:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8418,29 +8786,29 @@ msgstr "Omvandlad från:{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Hämta från OSM längs med detta spår" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Hämta allting inom:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "{0} meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "Största tillåtna område per begäran:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8451,9 +8819,9 @@ "Önskar du
fortsätta?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "Det finns inte något GPX-spår i lagret att knyta ljudet till." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8463,5 +8831,5 @@ "än dess slut uteslöts eller flyttades till början." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8471,23 +8839,23 @@ "kunna uppskattas med någon rimlighet uteslöts." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Datalager {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "utanför hämtat område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8496,5 +8864,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8508,5 +8876,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8519,11 +8887,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8532,36 +8900,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} består av:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Omvandla till gpx-lager" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8569,5 +8937,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8576,5 +8944,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8582,5 +8950,5 @@ msgstr[1] "punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8589,5 +8957,5 @@ msgstr[1] "ett spår med {0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8596,5 +8964,5 @@ msgstr[1] "{0} består av {1} spår" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8603,24 +8971,24 @@ msgstr[1] "{0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "GPX-filer" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Filen {0} är fortfarande aktiv under namnet \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Fel vid tolkning {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Kunde inte öppna \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8632,34 +9000,34 @@ "välj en tidzon
" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "Fototid (från exif):" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "Gps-tid (läst från fotot ovan): " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "Jag är i följande tidzon: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Inget datum" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Öppna ett annat foto" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synkronisera tid med hjälp av ett foto av GPS-mottagaren" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8669,71 +9037,157 @@ "Använd begärt format" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Ogiltigt datum" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "GPX-spår: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "Öppna ett annat foto" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "Auto-gissa" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "Uppdatera position för: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Tidszon: " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "Förskjutning:" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" -"Jag kan ta en bild av min GPS-mottagare.
Kan detta vara till nytta?" -"" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Uppdatera position för: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Alla bilder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Bilder utan positionsangivelse i exif" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Bilder som inte taggats ännu" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Inget markerat!" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, fuzzy, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "Parade ihop {0} av {1} foton med GPX-spåret" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "Sätt bilder i relation till GPX-spår" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "Korrelera" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Auto-gissa" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "Ogiltig tidszon" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "Ogiltig förskjutning" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +#, fuzzy +msgid "Try Again" +msgstr "Spårar" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "Tidszon: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "Minuter: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "Sekunder: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, fuzzy, java-format +msgid "
(Time difference of {0} days)" +msgstr "(Tidsdifferens om {0} dagar)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "Matchning av fotografier mot spår misslyckades" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "Justera tidszon och tidsförskjutning" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "De markerade fotografierna innehåller ingen tidsinformation." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "Fotografierna innehåller ingen tidsinformation." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" +"Det valda GPX-spåret innehåller inte några tidsstämplar. Välj ett annat spår." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "GPX-spåret saknar tidsinformation" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "Välj ett GPX-spår" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "Inget GPX-spår har valts" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8744,9 +9198,5 @@ "Förväntat format: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Ogiltig tidszon" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8757,135 +9207,56 @@ "Förväntat format: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Ogiltig förskjutning" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Hittade {0} träffar för {1} i GPX-spår {2}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPX-spår har hämtats" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "De markerade fotografierna innehåller ingen tidsinformation." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Fotografierna innehåller ingen tidsinformation." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" -"Det valda GPX-spåret innehåller inte några tidsstämplar. Välj ett annat spår." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX-spåret saknar tidsinformation" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Tidszon: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minuter: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Sekunder: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "Parade ihop {0} av {1} foton med GPX-spåret" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Tidsdifferens om {0} dagar)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Förskjutning mellan spår och foton: {0}m {1}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "Matchning av fotografier mot spår misslyckades" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Justera tidszon och tidsförskjutning" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Standardinställningar" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "Extraherar GPS-plats från EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "Påbörjar foldergenomläsning" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "Läs in foton..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Läser {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Läser igenom folder {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Fel vid läsning av filer från folder {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Geotaggade bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "Korrelerar med GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -8893,52 +9264,99 @@ msgstr[1] "bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "{0} hittades med gps-taggar." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../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:584 +msgid "Always delete and don't show this dialog again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Filen kunde inte hittas." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Ingen bild" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "Hämtar {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Fel i fil {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Visa geotaggade foton" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Föregående" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Föregående bild" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Växla: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Ta bort foto från lagret" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Ta bort från relation" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Nästa" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Nästa bild" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Centrera visning" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8949,5 +9367,5 @@ "Höjd: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -9048,4 +9466,12 @@ msgid "Error displaying URL" msgstr "Fel vid visning av URL" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9272,7 +9698,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "Alla" @@ -9341,6 +9766,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Cykel" @@ -9740,31 +10165,91 @@ msgstr "Projektionen {0} kunde inte aktiveras. Använder Merkator" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Aktivera proxyserver" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anonym" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Vandrarhem" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Port:" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Lösenord" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +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:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +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:298 msgid "Proxy Settings" msgstr "Proxyinställningar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Värd för proxyserver" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Port för proxyserver" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Användarnamn för proxyserver" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Lösenord för proxyserver" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "Bas-URL för OSM-servern (REST API)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "" + +#: ../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 "" +"Lösenord för OSM-kontot. Lämna blankt för att inte spara något lösenord." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "Bas-URL för servern" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM-lösenord" + +#: ../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 "" #. 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 @@ -10072,5 +10557,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -10080,13 +10565,13 @@ msgstr[1] "Ta bort gamla nycklar för upp till {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10094,18 +10579,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Valfria attribut:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "slutenväg" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Okänd typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10116,16 +10601,16 @@ msgstr "Kunde inte läsa källan till snabbval för taggning: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Fel vid tolkning {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Objekt av typ {0} stöds." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10134,18 +10619,18 @@ msgstr[1] "Ändra {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Inget markerat!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Urvalet passar inte!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Tillämpa snabbval" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Ändra egenskaper" @@ -10174,4 +10659,11 @@ msgstr "Hämtar punkter {0} till {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10187,12 +10679,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "NullPointerException, Det saknas förmodligen några taggar." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Förbereder data..." +#: ../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 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, 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 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10295,16 +10842,16 @@ msgstr "Tolkningsfel: ogiltig dokumentstruktur för gpx-dokument" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10314,40 +10861,40 @@ msgstr "Hämtar OSM-data..." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10355,10 +10902,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Hämtar punkter {0} till {1}..." -msgstr[1] "Hämtar punkter {0} till {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10395,14 +10942,14 @@ msgstr "Import från NMEA misslyckades!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 #, java-format msgid "" @@ -10411,16 +10958,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10428,66 +10975,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../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 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "Stänger ändringssamling..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Förbereder..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Skickar in..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Förbereder data..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Ändra {0} objekt" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../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:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10513,4 +11071,14 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 msgid "Invalid bz2 file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." msgstr "" @@ -10522,5 +11090,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10547,5 +11115,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10553,5 +11121,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10564,5 +11132,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10573,58 +11141,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Felaktigt lösenord eller användarnamn." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Varning: Lösenordet skickas okrypterat." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Spara användare och lösenord (okrypterat)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Ange lösenord" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Logga in" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "Bas-URL för OSM-servern (REST API)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Lösenord för OSM-kontot. Lämna blankt för att inte spara något lösenord." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "Bas-URL för servern" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM-lösenord" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -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 "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10714,5 +11230,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10721,38 +11244,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10760,19 +11283,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Ofullständig -specifikation med ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "Ogiltigt objekt med id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10782,8 +11305,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10793,25 +11316,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10819,5 +11358,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10826,5 +11365,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10832,5 +11371,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10839,13 +11378,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Förbereder OSM-data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10868,21 +11407,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Laddar ner påbörjade changesets..." +msgstr[1] "Laddar ner påbörjade changesets..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "Laddar ner påbörjade changesets..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10910,9 +11461,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10972,5 +11519,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -10980,4 +11527,9 @@ msgid "Uploading data ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "Raderade eller flyttade primitiv" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11020,12 +11572,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Ta bort {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Fel vid borttagande av fil för insticksmodulen: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11172,9 +11724,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "ingen beskrivning tillgänglig" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" @@ -11306,4 +11858,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "Parameter {0} > 0 krävs. Erhöll {1}." + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11598,6 +12165,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Skicka in spår" @@ -11683,5 +12250,5 @@ msgstr "Skickar in GPX-spår" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Skickar in spår till openstreetmap.org" @@ -11692,5 +12259,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Adressinterpolation" @@ -11705,11 +12272,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Udda" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "Jämna" @@ -11720,24 +12284,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Nummer" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "naturfenomen" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "bild" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Uthyrning" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11755,7 +12315,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "inre segment" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -11868,5 +12427,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:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11928,21 +12487,21 @@ #. 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:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "Välj commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "Välj en av..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "Automatkälla" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11951,13 +12510,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11982,17 +12541,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "Aktivera automatisk cachning." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "Största tillåtna cachestorlek (MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -12004,9 +12563,9 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "Fransk Cadastre-WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -12014,10 +12573,10 @@ "källa är aktiverat." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "Källa" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -12027,5 +12586,5 @@ "JOSM:s inställningar." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -12035,52 +12594,49 @@ "gråtoner). Användbart för text på mörka bakgrunder." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Rita en rektangel runt data nedladdad från WMS-servern." #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Hämta mindre bilder (högre kvalitet, men mer minneskrävande)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Äldsta filerna raderas automatiskt när denna storlek överskrids" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "Tagg för källa har automatiskt lagts till:" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "Lägg \"source=...\" till objekt?" @@ -12282,5 +12838,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "Plats" @@ -12473,5 +13029,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Ingen data har lästs in." @@ -12493,9 +13049,9 @@ msgstr "Konvertera till GPX-lager med anonymiserad tid" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "redigera GPX-spår" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "RedigeraGpx" @@ -12884,7 +13440,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: 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 msgid "water" msgstr "vatten" @@ -13044,19 +13600,19 @@ msgstr "Kunde inte skaffa en bild" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Ansluter" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Ansluten" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "Inte ansluten" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Anslutning misslyckades" @@ -13095,33 +13651,33 @@ msgstr "LiveGPS-lager" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "Fånga GPS-spår" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "" "Anslut till en gpsd-server och visa nuvarande position i ett LiveGPS-lager." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Centrera en gång" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Centrera LiveGPS-lagret runt nuvarande position." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Autocentrera" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Centrera kontinuerligt LiveGPS-lagret runt nuvarande position." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13172,9 +13728,9 @@ msgstr "Det går inte att rita utanför världen." -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "mätläge" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Mätningar" @@ -13212,5 +13768,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13221,13 +13777,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13375,5 +13931,5 @@ msgstr "Firefox-applikationen" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13468,5 +14024,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13542,41 +14098,41 @@ msgstr "Ange viktvärden" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Glidande karta" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Hämta ruta" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Hämta alla rutor" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "Öka zoomläge" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "Minska zoomläge" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "" @@ -13750,4 +14306,43 @@ "Du måste först ange källor för snabbval för taggning i inställningarna." +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "Jämna" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "Lägst nummer" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "Högst nummer" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Vägar" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Högst nummer" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13766,42 +14361,20 @@ msgstr "Vänd husrad" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "Gör radhus av husrad" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "Skapar enskilda byggnader från en lång byggnad." -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "Markera en enda, stängd väg med minst fyra noder." -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "Husrad" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "Högst nummer" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "Lägst nummer" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "Interpolering" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Gatunamn" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "Valfri" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13816,5 +14389,5 @@ msgstr "Inga valideringsfel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Rutnät" @@ -14479,38 +15052,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "byggnad (building)" @@ -14524,5 +15067,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "yta (area)" @@ -14645,10 +15188,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15349,6 +15892,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "Referens" @@ -15794,5 +16337,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "Bredd (meter)" @@ -15910,5 +16453,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15920,5 +16463,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "skog" @@ -16176,4 +16719,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -16205,8 +16751,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "ja" @@ -16354,9 +16902,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "nej" @@ -16601,5 +17150,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "bostadsgata" @@ -16634,5 +17183,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "tillfartsväg" @@ -16666,6 +17215,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "under byggnad" @@ -16715,5 +17264,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "rondell" @@ -16901,6 +17450,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "Vandringsled" @@ -17021,5 +17570,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -17045,4 +17593,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -17052,15 +17601,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "Operatör" @@ -17272,7 +17821,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "Höjd" @@ -17691,5 +18240,5 @@ msgstr "mosse" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17699,5 +18248,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "kärr" @@ -18223,32 +18772,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "Öppettider" @@ -18307,91 +18856,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18406,5 +18955,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18423,7 +18972,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Referensnummer" @@ -18439,5 +18988,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "underjordisk" @@ -18450,6 +18999,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Avgift" @@ -18488,22 +19037,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Affär" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Redigera bilförsäljare" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Bilverkstad" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Redigera en bilverkstad" @@ -18511,5 +19048,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Uthyrning" @@ -18518,10 +19055,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Redigera biluthyrning" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Bilpool" @@ -18529,5 +19066,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "Redigera bilpool" @@ -18535,10 +19072,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Redigera en cykelparkering" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Kapacitet" @@ -18547,22 +19084,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Redigera en cykeluthyrning" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Redigera cykelaffär" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Kollektivtrafik" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18572,5 +19102,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18578,5 +19108,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-klassificering" @@ -18584,5 +19114,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Järnvägshållplats" @@ -18590,5 +19120,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Redigera hållplats" @@ -18596,5 +19126,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Spårvagnshållplats" @@ -18603,5 +19133,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Redigera spårvagnshållplats" @@ -18609,5 +19139,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Plattform" @@ -18616,5 +19146,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Redigera plattform" @@ -18626,5 +19156,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "Referens (spårnummer)" @@ -18632,10 +19162,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "Område" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Tunnelbaneingång" @@ -18644,10 +19174,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Redigera tunnelbaneingång" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Rullstol" @@ -18656,5 +19186,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Bussterminal" @@ -18663,5 +19193,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Redigera en bussterminal" @@ -18669,5 +19199,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Busshållplats" @@ -18677,5 +19207,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Redigera en busshållplats" @@ -18684,17 +19214,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "VIndskydd" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Bänk" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Bussplattform" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Redigera en bussplattform" @@ -18702,5 +19240,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Taxi" @@ -18708,5 +19246,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Redigera en taxistation" @@ -18714,5 +19252,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Flygplats" @@ -18720,15 +19258,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -18736,10 +19274,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Logi" @@ -18751,5 +19289,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hotell" @@ -18758,15 +19296,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Redigera ett hotell" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Stjärnor" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Motell" @@ -18774,20 +19312,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Redigera ett motell" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Pensionat" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Redigera pensionat" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Fäbod" @@ -18795,10 +19333,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Redigera fäbod" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Vandrarhem" @@ -18806,30 +19344,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Redigera ett vandrarhem" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "Alphydda" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "Redigera alphydda" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Husvagnscamping" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Redigera en husvagnscamping" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Campingplats" @@ -18837,10 +19375,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Redigera en campingplats" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Mat+Dryck" @@ -18851,5 +19389,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurang" @@ -18857,5 +19395,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Redigera en restaurang" @@ -18863,5 +19401,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Kök" @@ -18869,61 +19407,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "italienskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "kinesiskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "hamburgare" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "grekiskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "tyskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "indiskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "lokalt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "turkiskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "asiatiskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "thailändskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "mexikanskt" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "japanskt" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Snabbmat" @@ -18931,9 +19469,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Redigera en snabbmatsrestaurang" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Kafé" @@ -18941,9 +19479,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Redigera kafé" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Pub" @@ -18951,18 +19489,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Redigera pub" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "Biergarten" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Redigera Biergarten" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "" @@ -18970,9 +19508,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Nattklubb" @@ -18980,24 +19518,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Redigera nattklubb" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Turism" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Sevärdhet" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "Redigera sevärdhet" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Museum" @@ -19005,9 +19543,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Redigera museum" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Zoo" @@ -19016,9 +19554,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Redigera zoo" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Utsiktsplats" @@ -19026,24 +19564,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Redigera utsiktsplats" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Utsiktstorn" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Nöjespark" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Redigera en nöjespark" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Konst" @@ -19051,5 +19589,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Redigera konstverk" @@ -19057,19 +19595,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Karta" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -19107,5 +19645,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: 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 @@ -19113,28 +19651,28 @@ msgstr "gata" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "" @@ -19144,5 +19682,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -19150,6 +19688,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Cykling" @@ -19157,5 +19695,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -19163,6 +19701,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Skidåkning" @@ -19170,5 +19708,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -19176,46 +19714,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "historiskt" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "naturfenomen" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "djurliv" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -19223,29 +19761,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. +msgid "Phone number" +msgstr "" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1782 +msgid "Other Information Points" +msgstr "" + +#. item "Tourism/Shelter" #: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 -msgid "Phone number" -msgstr "" - -#. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 -msgid "Other Information Points" -msgstr "" - -#. item "Tourism/Shelter" -#: build/trans_presets.java:1801 msgid "Edit Shelter" msgstr "Redigera vindskydd" @@ -19253,25 +19791,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Eldstad" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Picknickplats" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Redigera picknickplats" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Historiska platser" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Slott" @@ -19280,19 +19818,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Redigera slott" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Ruiner" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Redigera ruiner" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Utgrävningsplats" @@ -19301,9 +19839,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Redigera utgrävningsplats" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Krigsskådeplats" @@ -19311,10 +19849,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Redigera krigsskådeplats" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19322,5 +19860,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19328,15 +19866,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Monument" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Redigera monument" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Minnesmärke" @@ -19344,55 +19882,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Redigera minnesmärke" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "Vägkors" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "Redigera ett vägkors" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "Vägaltare" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "Redigera ett vägaltare" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "Nöje" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Badanläggning" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Redigera badanläggning" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Lekplats" @@ -19400,35 +19938,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Redigera lekplats" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Fiske" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Redigera fiske" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Sportfaciliteteter" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Stadion" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Redigera stadion" @@ -19442,6 +19980,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "välj sport:" @@ -19833,30 +20371,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: 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 msgid "sport" msgstr "sport" @@ -19866,225 +20404,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "flera" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "bågskytte" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "friidrott" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "australisk fotboll" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "baseball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "basket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "boule" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "kanot" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "klättring" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "cricket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "kricket_nät" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "krocket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "cykling" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "hundracing" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "ridsport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "amerikansk fotboll" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "gymnastik" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "ishockey" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "hästkapplöpning" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "motorsport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "pelota" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "rackets" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "rugby" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "skytte" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "skateboard" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "skridskoåkning" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "skidåkning" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "fotboll" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "simning" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "bordtennis" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tennis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Sporthall" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Redigera sporthall" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "Plan" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "Redigera plan" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "Bana" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "Redigera bana" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Golfbana" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Redigera golfbana" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Minigolf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Redigera minigolfbana" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Flera" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "Redigera flersportsfacilitet" @@ -20123,21 +20661,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "typ" @@ -20176,203 +20714,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "plan" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "sporthall" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "stadion" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "Friidrott" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "Redigera friidrott" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "Bågskytte" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Redigera bågskytte" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Klättring" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Redigera klättring" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "Kanotpaddling" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "Redigera kanotpaddling" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Redigera cykling" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Hundkapplöpning" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Redigera hundkapplöpning" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "Ridsport" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "Redigera ridsport" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "Hästkapplöpning" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "Redigera hästkapplöpning" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "Gymnastik" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "Redigera gymnastik" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "Motorsport" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Redigera motorsport" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "Skridskoåkning" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "Redigera skridskoåkning" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "Skateboard" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "Redigera skateboard" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "Simning" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Redigera simning" @@ -20380,56 +20918,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "Redigera skidåkning" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "Skidspårstyp" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "utförsåkning" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "längdskidåkning" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Svårighetsgrad" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "nybörjare" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "lätt" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "expert" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "ospårat" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Skytte" @@ -20437,182 +20975,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Redigera skytte" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Bollsport" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Fotboll" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Redigera fotboll" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "Amerikansk fotboll" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "Redigera amerikansk fotboll" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Australisk fotboll" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "Redigera australisk fotboll" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Redigera baseball" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Basket" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Redigera basket" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Redigera golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "golf_bana" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Redigera boule" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Redigera cricket" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "Cricketnät" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Redigera cricketnät" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "Krocket" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "Redigera krocket" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "Ishockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Redigera ishockey" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "Redigera pelota" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "Rackets" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "Redigera rackets" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "Rugby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Redigera rugby" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Bordtennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Redigera bordtennis" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Redigera tennis" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Byggnader" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Byggnad" @@ -20620,5 +21158,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Offentlig byggnad" @@ -20626,10 +21164,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Redigera offentlig byggnad" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Stadshus" @@ -20637,10 +21175,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Redigera stadshus" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Ambassad" @@ -20648,10 +21186,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Redigera ambassad" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Domstol" @@ -20660,10 +21198,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Redigera domstol" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Fängelse" @@ -20672,10 +21210,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Redigera fängelse" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Polisstation" @@ -20685,10 +21223,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Redigera polisstation" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Brandstation" @@ -20697,10 +21235,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Redigera brandstation" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Postkontor" @@ -20708,5 +21246,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Redigera postkontor" @@ -20714,15 +21252,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Barndaghem" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Redigera barndaghem" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Skola" @@ -20730,10 +21268,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Redigera skola" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Högskola/universitet" @@ -20741,10 +21279,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Redigera högskola/universitet" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Högskola" @@ -20752,5 +21290,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Redigera högskola" @@ -20758,5 +21296,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Biograf" @@ -20765,10 +21303,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Redigera biograf" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Bibliotek" @@ -20777,9 +21315,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Redigera bibliotek" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Konstcenter" @@ -20787,10 +21325,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Redigera konstcenter" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Teater" @@ -20799,10 +21337,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Redigera teater" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Religiös helgedom" @@ -20812,5 +21350,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Redigera religiös helgedom" @@ -20819,6 +21357,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Religion" @@ -20827,66 +21365,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "buddism" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "kristendom" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "hinduism" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "jain" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "judendom" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "islam" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "daoism" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "zoroastrianism" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Samfund" @@ -20895,81 +21433,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "anglikaner" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "baptister" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "katoliker" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "evangelister" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "jehovas_vittnen" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "luteraner (inkl. Svenska kyrkan)" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "metodister" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "mormoner" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "ortodoxa" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "pinstvänner" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "presbytarianer" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "protestanter" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "kväkare" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "shiamuslimer" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "sunnimuslimer" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Adresser" @@ -20978,5 +21516,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Redigera adressinformation" @@ -20984,5 +21522,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Husnummer" @@ -20990,20 +21528,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Husnamn" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Gatunamn" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Stadsnamn" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Postnummer" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Landskod" @@ -21012,5 +21555,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Redigera adressinterpolation" @@ -21018,61 +21561,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Numreringsschema" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "udda" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "jämn" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Byggnadsverk" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Fabrik" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Redigera fabriksbyggnad" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Torn" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Redigera torn" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "" @@ -21080,25 +21623,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Vattentorn" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Redigera vattentorn" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Gasklocka" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Redigera gasklocka" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Fyrtorn" @@ -21106,10 +21649,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Fyrtorn" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Väderkvarn" @@ -21117,10 +21660,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Redigera väderkvarn" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Rörledning" @@ -21129,37 +21672,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Redigera rörledning" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "naturgas" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Reningsverk" @@ -21169,10 +21712,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Redigera reningsverk" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Kran" @@ -21180,10 +21723,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Redigera kran" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Fyrbåk" @@ -21191,10 +21734,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Redigera fyrbåk" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Mätpunkt" @@ -21202,10 +21745,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Redigera mätpunkt" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Övervakning" @@ -21213,5 +21756,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Redigera övervakningskamera" @@ -21219,5 +21762,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Kraftverk" @@ -21227,35 +21770,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Redigera ett kraftverk" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "vindkraft" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "vattenkraft" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "fossila bränslen" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "kärnkraft" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "kolkraft" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "solkraft" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Kraftstation" @@ -21264,10 +21807,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Redigera en kraftstation" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Transformatorstation" @@ -21276,5 +21819,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Redigera en transformatorstation" @@ -21282,10 +21825,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Kraftledningsmast" @@ -21296,23 +21839,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Redigera en kraftledningsmast" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Kraftledning" @@ -21321,75 +21864,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Redigera en kraftledning" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Spänning" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "Inrättningar" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Toaletter" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Anteckning" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Brevlåda" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Telefon" @@ -21398,5 +21941,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Redigera en telefon" @@ -21404,5 +21947,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Mynt" @@ -21410,5 +21953,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Anteckningar" @@ -21416,5 +21959,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "Betalkort" @@ -21422,5 +21965,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Kontokort" @@ -21428,15 +21971,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Kreditkort" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Telefonkort" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Återvinning" @@ -21445,5 +21988,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Redigera en återvinningsstation" @@ -21451,68 +21994,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Batterier" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Burkar" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Kläder" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Glas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Papper" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Metallskrot" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Bänk" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21583,39 +22121,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: 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 msgid "green" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Jakttorn" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Redigera ett jakttorn" @@ -21624,30 +22162,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Höjd" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "låg" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "halv" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "full" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Dölj" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Lås" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Fontän" @@ -21656,10 +22194,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Redigera en fontän" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Dricksvatten" @@ -21668,10 +22206,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Redigera dricksvattensfacilitet" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "" @@ -21679,33 +22217,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Affärer" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Redigera bilförsäljare" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Lakewalker" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Redigera cykelaffär" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Stormarknad" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Redigera stormarknad" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Närköp" @@ -21713,9 +22275,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Redigera närköp" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Kiosk" @@ -21723,27 +22285,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Redigera kiosk" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Automat" @@ -21751,5 +22313,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Redigera en automat" @@ -21757,88 +22319,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Varor till försäljning" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "biljetter för allmänna transportmedel" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "parkeringsbiljetter" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "mat" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "dryck" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "godis" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "cigaretter" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "foton" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "djurmat" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "tidningar" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "leksaker" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "frimärken" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM-kort" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "telefonkort" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "kondomer" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "tamponger" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "hundpåsar" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Slakteri" @@ -21846,9 +22408,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Redigera slakteri" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Bageri" @@ -21856,9 +22418,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Redigera bageri" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Florist" @@ -21866,18 +22428,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Redigera florist" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "" @@ -21885,54 +22447,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Drycker" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Dator" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Redigera datoraffär" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Electronik" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Redigera elektronikaffär" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Redigera hifi-affär" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Möbler" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Redigera möbelaffär" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Trädgårdscenter" @@ -21940,9 +22502,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Redigera trädgårdscenter" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "Järnvaror" @@ -21950,9 +22512,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "Redigera järnaffär" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Gör-det-själv-affär" @@ -21960,54 +22522,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Redigera gör-det-själv-affär" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Kontorsmaterial" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Redigera pappershandel" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Hårfrisör" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Redigera hårfrisör" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Skor" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Redigera skoaffär" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Leksaker" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Redigera leksaksaffär" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "Videobutik" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "Redigera videobutik" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Kemtvätt" @@ -22015,9 +22577,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Redigera kemtvätt" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Tvätteri" @@ -22025,9 +22587,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Redigera tvätteri" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "Friluftsliv" @@ -22035,28 +22597,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Redigera affär för friluftsliv" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Redigera sportaffär" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Redigera optiker" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Pengar" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Bank" @@ -22064,14 +22626,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Redigera bank" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Uttagsautomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Växlingskontor" @@ -22079,5 +22641,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Redigera växlingskontor" @@ -22085,15 +22647,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Redigera uttagsautomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Hälsovård" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Läkare" @@ -22101,18 +22663,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Redigera läkare" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Tandläkare" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Redigera tandläkare" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Apotek" @@ -22120,5 +22682,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Redigera apotek" @@ -22126,9 +22688,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "Receptutlämnande" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Sjukhus" @@ -22136,10 +22698,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Redigera sjukhus" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "" @@ -22148,5 +22710,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "" @@ -22155,20 +22717,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Telefonnummer" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "Använd internationellt format, ex +12-345-67890" @@ -22176,5 +22738,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Veterinär" @@ -22183,64 +22745,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Redigera veterinär" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Platser" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Redigera en kontinent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Land" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Redigera land" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Delstat" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Redigera delstat" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Region" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Redigera region" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "Län" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Redigera län" @@ -22248,15 +22810,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Stad" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Redigera stad" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Småstad" @@ -22264,10 +22826,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Redigera småstad" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Förort" @@ -22275,25 +22837,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Redigera förort" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Mindre tätort" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Redigera mindre tätort" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Småort" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Redigera småort" @@ -22301,5 +22863,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "Plats" @@ -22307,10 +22869,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "Redigera plats" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Ö" @@ -22318,10 +22880,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Redigera ö" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22329,5 +22891,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22335,5 +22897,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Grottöppning" @@ -22341,10 +22903,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Redigera en grottöppning" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Topp" @@ -22352,10 +22914,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Redigera topp" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Glaciär" @@ -22363,10 +22925,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Redigera en glaciär" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Vulkan" @@ -22374,70 +22936,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Redigera en vulkan" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Gränser" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Nationella" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Redigera nationsgränser" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Administrativ" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Redigera administrativa gränser" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Civilrättslig" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Redigera en civilrättslig gräns" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Redigera politiska gränser" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Redigera gräns för nationalpark" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Markanvändning" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Träd" @@ -22446,15 +23008,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Redigera ett träd" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Botaniskt namn" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Naturskog" @@ -22463,5 +23025,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Redigera naturskog" @@ -22469,17 +23031,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "barrskog" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "lövskog" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "blandskog" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Kulturskog" @@ -22488,14 +23050,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Redigera användning av mark för skogsbruk" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Naturreservat" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Redigera naturreservat" @@ -22503,25 +23065,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "Bergsluttning (med lösa stenar)" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Redigera bergssluttning (med lösa stenar)" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Buskage" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Redigera buskage" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "Höglandshed" @@ -22529,10 +23091,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "Redigera en höglandshed" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Hed" @@ -22540,5 +23102,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Redigera hed" @@ -22546,5 +23108,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Gårdsplan" @@ -22553,45 +23115,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Redigera markanvändning som gårdsplan" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Jordbruksmark" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Redigera användning av mark för jordbruk" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "Äng" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "Redigera markanvändning som äng" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Vingård" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Redigera användning av mark för vingård" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Kolonilotter" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Redigera användning av mark för koloniområden" @@ -22599,25 +23161,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Trädgård" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Redigera trädgård" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Gräs" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "Redigera markanvändning som gräsyta" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "Allmänning" @@ -22625,10 +23187,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "Redigera användning av mark för allmänning" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "Allmänning" @@ -22636,20 +23198,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "Redigera allmänning" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Redigera park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Fritidsområde" @@ -22657,5 +23219,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Redigera användning av mark för fritidsområde" @@ -22663,15 +23225,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Bostadsområde" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Redigera användning av mark för bostadsområde" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Kyrkogård" @@ -22679,9 +23241,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Redigera kyrkogård" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Begravningsplats" @@ -22689,39 +23251,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Redigera användning av mark för begravningsplats" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Detaljhandel" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Redigera användning av mark för detaljhandel" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Affärsområde" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Redigera användning av mark för affärsområde" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Industriområde" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Redigera användning av mark för industriområde" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Järnvägsmark" @@ -22729,15 +23291,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Redigera användning av mark för järnvägsmark" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Militärt område" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Redigera användning av mark för militärt område" @@ -22745,55 +23307,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Byggnadsplats" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Redigera markanvändning som byggnadsplats" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "Deponi" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Redigera användning av mark för deponi av avfall" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Stenbrott" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Redigera användning av mark för stenbrott" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "Multipolygon" @@ -22803,5 +23365,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Redigera en multipolygon" @@ -22810,10 +23372,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "yttre segement" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "inre segment" @@ -22821,5 +23383,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "" @@ -22828,5 +23390,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "" @@ -22834,34 +23396,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Begränsning" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "ingen_vänstersväng" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "ingen_högersväng" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "inte_rakt_fram" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "ingen_u_sväng" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "enbart_högersväng" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "enbart_vänstersväng" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "enbart_rakt_fram" @@ -22870,15 +23432,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "från sträcka" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "via nod eller sträcka" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "till sträcka" @@ -22886,5 +23448,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "" @@ -22893,5 +23455,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "" @@ -22899,5 +23461,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "" @@ -22969,24 +23531,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: 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 msgid "bicycle" msgstr "cykel" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "buss" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "" @@ -23039,5 +23601,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: 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 @@ -23046,13 +23608,13 @@ msgstr "fot" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "" @@ -23066,10 +23628,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "tunnelbana" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "" @@ -23077,31 +23639,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "" @@ -23110,30 +23672,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "" @@ -23344,130 +23906,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23484,98 +23920,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "förlegad" @@ -23952,7 +24297,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: 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 msgid "highway_track" msgstr "landsvägsspår" @@ -24016,13 +24361,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: 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 msgid "rail" msgstr "räls" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24038,5 +24462,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "" @@ -24050,5 +24474,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -24069,5 +24493,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "vändplats" @@ -24082,5 +24506,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -24095,5 +24519,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "flodbank" @@ -24107,5 +24531,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "bäck" @@ -24119,5 +24543,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "hamn" @@ -24139,16 +24563,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "akvedukt" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24245,4 +24657,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24311,13 +24730,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: 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 msgid "manmade" msgstr "byggnadsverk" @@ -24363,6 +24782,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24379,7 +24798,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: 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 msgid "railwaypoint" msgstr "järnvägspunkt" @@ -24402,10 +24821,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "" @@ -24441,11 +24860,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: 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 msgid "oldrail" msgstr "" #. color rail +#. #. 1 #. 50000 @@ -24486,6 +24906,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "" @@ -24499,5 +24919,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "terminal" @@ -24519,5 +24939,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "" @@ -24531,5 +24951,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "" @@ -24537,4 +24957,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24584,7 +25011,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: 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 msgid "aerialway" msgstr "linbana" @@ -24601,5 +25028,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "" @@ -24614,5 +25041,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "" @@ -24627,5 +25054,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "" @@ -24640,5 +25067,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24653,5 +25080,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "" @@ -24666,5 +25093,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "" @@ -24784,11 +25211,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 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 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: 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 msgid "power" msgstr "kraft" @@ -24802,5 +25229,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "pir" @@ -24814,5 +25241,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "rörledning" @@ -24940,12 +25367,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: 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 msgid "leisure" msgstr "fritid" @@ -24959,5 +25403,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "marina" @@ -24995,4 +25439,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25011,4 +25471,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25029,8 +25497,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: 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 msgid "amenity" msgstr "inrättning" @@ -25132,10 +25602,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: 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 msgid "amenity_traffic" msgstr "trafikinrättning" @@ -25389,5 +25859,5 @@ #. #. -#. +#. #. color health #. @@ -25533,4 +26003,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25550,23 +26028,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: 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 msgid "amenity_light" msgstr "" @@ -25598,6 +26076,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "" @@ -25658,14 +26136,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: 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 msgid "health" msgstr "hälsa" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -26012,5 +26490,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -26033,5 +26510,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "affär" @@ -26103,8 +26581,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: 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 msgid "hotel" msgstr "hotell" @@ -26205,9 +26683,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: 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 msgid "tourism" msgstr "turism" @@ -26295,9 +26773,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "historisk" @@ -26311,5 +26789,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "stenbrott" @@ -26323,5 +26801,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "" @@ -26343,5 +26821,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "hamnbassäng" @@ -26355,5 +26833,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "skog" @@ -26367,5 +26845,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "gårdsplan" @@ -26388,5 +26866,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "detaljhandel" @@ -26400,5 +26878,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "industri" @@ -26412,5 +26890,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "" @@ -26424,5 +26902,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "" @@ -26436,5 +26914,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "" @@ -26491,7 +26969,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: 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 msgid "military" msgstr "militär" @@ -26505,5 +26983,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "begravningsplats" @@ -26516,5 +26994,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "topp" @@ -26529,5 +27007,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "glaciär" @@ -26541,5 +27019,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "vulkan" @@ -26594,8 +27072,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: 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 msgid "natural" msgstr "naturfenomen" @@ -26609,5 +27087,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "buskage" @@ -26621,5 +27099,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "hed" @@ -26633,5 +27111,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26645,5 +27123,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "lera" @@ -26657,5 +27135,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "strand" @@ -26733,8 +27211,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: 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 msgid "route" msgstr "rutt" @@ -26782,7 +27260,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: 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 msgid "boundary" msgstr "gräns" @@ -26932,11 +27410,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: 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 msgid "place" msgstr "plats" @@ -26984,6 +27462,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "adress" @@ -27339,98 +27817,122 @@ msgstr "" +#~ msgid "Updating primitive" +#~ msgstr "Uppdaterar primitiv" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "En avslutande parentes förväntades" + #~ msgid "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" #~ msgstr "" -#~ "Kan inte ångra kommando \"{0}\" eftersom lager \"{1}\" inte längre är " -#~ "närvarande" - -#~ msgid "Images for {0}" -#~ msgstr "Bilder för {0}" - -#~ msgid "Read GPX..." -#~ msgstr "Läs in GPX..." - -#~ msgid "No time for point {0} x {1}" -#~ msgstr "Tid saknas för punkt {0} x {1}" - -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Kan inte lästa tidpunkt \"{0}\" från punkt {1} x {2}" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Inga bilder med läsbara tidsangivelser hittades." - -#~ msgid "GPS start: {0}" -#~ msgstr "GPS startpunkt: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "GPS slutpunkt: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "nuvarande delta: {0}s" +#~ "Antal ändringar överskrider det maximala antalet ändringar, antal " +#~ "ändringar är {0}, max är {1}" + +#~ msgid "" +#~ "I can take a picture of my GPS receiver.
Can this help?" +#~ msgstr "" +#~ "Jag kan ta en bild av min GPS-mottagare.
Kan detta vara till " +#~ "nytta?" + +#~ msgid "All images" +#~ msgstr "Alla bilder" + +#~ msgid "Images with no exif position" +#~ msgstr "Bilder utan positionsangivelse i exif" + +#~ msgid "Not yet tagged images" +#~ msgstr "Bilder som inte taggats ännu" + +#~ msgid "Found {0} matches of {1} in GPX track {2}" +#~ msgstr "Hittade {0} träffar för {1} i GPX-spår {2}" + +#~ msgid "GPX Track loaded" +#~ msgstr "GPX-spår har hämtats" + +#~ msgid "Offset between track and photos: {0}m {1}s" +#~ msgstr "Förskjutning mellan spår och foton: {0}m {1}s" + +#~ msgid "Default Values" +#~ msgstr "Standardinställningar" + +#~ msgid "Enable proxy server" +#~ msgstr "Aktivera proxyserver" + +#~ msgid "Anonymous" +#~ msgstr "Anonym" + +#~ msgid "Proxy server host" +#~ msgstr "Värd för proxyserver" + +#~ msgid "Proxy server port" +#~ msgstr "Port för proxyserver" + +#~ msgid "Proxy server username" +#~ msgstr "Användarnamn för proxyserver" + +#~ msgid "Proxy server password" +#~ msgstr "Lösenord för proxyserver" + +#~ msgid "NullPointerException, possibly some missing tags." +#~ msgstr "NullPointerException, Det saknas förmodligen några taggar." + +#~ msgid "Preparing..." +#~ msgstr "Förbereder..." + +#~ msgid "Uploading..." +#~ msgstr "Skickar in..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Felaktigt lösenord eller användarnamn." + +#~ msgid "Enter Password" +#~ msgstr "Ange lösenord" + +#~ msgid "Login" +#~ msgstr "Logga in" + +#~ msgid "Auto-tag source added:" +#~ msgstr "Tagg för källa har automatiskt lagts till:" + +#~ msgid "Interpolation" +#~ msgstr "Interpolering" + +#~ msgid "Optional" +#~ msgstr "Valfri" + +#~ msgid "Shop" +#~ msgstr "Affär" + +#~ msgid "aqueduct" +#~ msgstr "akvedukt" + +#~ msgid "Move" +#~ msgstr "Flytta" + +#~ msgid "Email" +#~ msgstr "Email" #~ msgid "timezone difference: " #~ msgstr "tidsskillnad: " -#~ msgid "{0} within the track." -#~ msgstr "{0} inom spåret." - -#~ msgid "Sync clock" -#~ msgstr "Synka klocka" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "Datum i fil \"{0}\" kunde inte tolkas." - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"." +#~ msgid "Unsaved Changes" +#~ msgstr "Osparade ändringar" + +#~ msgid "Object" +#~ msgstr "Objekt" + +#~ msgid "Unknown version" +#~ msgstr "Okänd version" + +#~ msgid "unnamed" +#~ msgstr "namnlös" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Angiven tid kunde inte tolkas." #~ msgid "Image" #~ msgstr "Bild" -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Ange visat datum (mm/dd/yyyy HH:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "Tidszon för GPS-enhet (skillnad mot foto)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Synkronisera Tid med GPS-enheten" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "Angiven tid kunde inte tolkas." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - Geotaggade bilder" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Öppna bilder med AgPifoJ..." - -#~ msgid "osmarender options" -#~ msgstr "inställningar för osmarender" - -#~ msgid "" -#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -#~ "import EXIF geotagged pictures." -#~ msgstr "" -#~ "\"Another geotag plugin\" (Ytterligare ett geotag-plugin) för JOSM. " -#~ "Korrelerar bilder med GPS-spår eller importerar EXIF-geotaggade bilder." - -#~ msgid "Move" -#~ msgstr "Flytta" - -#~ msgid "Email" -#~ msgstr "Email" - -#~ msgid "Unsaved Changes" -#~ msgstr "Osparade ändringar" - -#~ msgid "Object" -#~ msgstr "Objekt" - -#~ msgid "Unknown version" -#~ msgstr "Okänd version" - -#~ msgid "unnamed" -#~ msgstr "namnlös" - #~ msgid "OSM username (email)" #~ msgstr "OSM-användarnamn (email)" @@ -27441,7 +27943,4 @@ #~ msgid "Unknown file extension." #~ msgstr "Okänd filändelse." - -#~ msgid "File could not be found." -#~ msgstr "Filen kunde inte hittas." #~ msgid "All the ways were empty" @@ -27542,4 +28041,40 @@ #~ msgstr "Konflikter upptäcktes under import." +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Kan inte lästa tidpunkt \"{0}\" från punkt {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Inga bilder med läsbara tidsangivelser hittades." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Tid saknas för punkt {0} x {1}" + +#~ msgid "Images for {0}" +#~ msgstr "Bilder för {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Läs in GPX..." + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS startpunkt: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "nuvarande delta: {0}s" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS slutpunkt: {0}" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Ange visat datum (mm/dd/yyyy HH:MM:SS)" + +#~ msgid "Sync clock" +#~ msgstr "Synka klocka" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Datum i fil \"{0}\" kunde inte tolkas." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"." + #~ msgid "name" #~ msgstr "namn" @@ -27553,4 +28088,7 @@ #~ msgid "File not found" #~ msgstr "Filen hittades inte" + +#~ msgid "{0} within the track." +#~ msgstr "{0} inom spåret." #~ msgid "Login name (email) to the OSM account." @@ -27617,4 +28155,7 @@ #~ msgstr "Navigation" +#~ msgid "osmarender options" +#~ msgstr "inställningar för osmarender" + #~ msgid "requested: {0}" #~ msgstr "begärd: {0}" @@ -27682,4 +28223,7 @@ #~ msgstr "Redigera egenskaper" +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Tidszon för GPS-enhet (skillnad mot foto)" + #~ msgid "Plugin already exists" #~ msgstr "Insticksmodulen finns redan" @@ -27703,4 +28247,10 @@ #~ msgid "Import TCX File..." #~ msgstr "Importera TCX-fil..." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Geotaggade bilder" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Öppna bilder med AgPifoJ..." #~ msgid "Metacarta Map Rectifier image id" @@ -27929,4 +28479,7 @@ #~ msgstr "Välj en eller flera slutna sträckor med åtminstone fyra noder." +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synkronisera Tid med GPS-enheten" + #~ msgid "Basic" #~ msgstr "Grundläggande" @@ -28040,4 +28593,11 @@ #~ "Ingen data som behövde uppdateras hittades. Har du redan öppnat eller " #~ "laddat ner ett datalager?" + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "\"Another geotag plugin\" (Ytterligare ett geotag-plugin) för JOSM. " +#~ "Korrelerar bilder med GPS-spår eller importerar EXIF-geotaggade bilder." #~ msgid "Remove route nodes" @@ -28181,4 +28741,10 @@ #~ "\"{1}\">ditt språk." +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Kan inte ångra kommando \"{0}\" eftersom lager \"{1}\" inte längre är " +#~ "närvarande" + #~ msgid "Helppage missing. Create it in English." #~ msgstr "Hjälpsida saknas. Skapa den på engelska."