Index: applications/editors/josm/i18n/po/sl.po =================================================================== --- applications/editors/josm/i18n/po/sl.po (revision 18656) +++ applications/editors/josm/i18n/po/sl.po (revision 18773) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-08 14:17+0000\n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-17 18:13+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Slovenian \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -28,20 +28,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Pomoč" +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#, java-format +msgid "Ignoring malformed URL: \"{0}\"" +msgstr "" + #: ../core/src/org/openstreetmap/josm/Main.java:431 -#, java-format -msgid "Ignoring malformed URL: \"{0}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../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 @@ -62,21 +62,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -84,6 +82,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -95,11 +93,20 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Pozor" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" +msgstr "" + +#: ../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 "" @@ -108,17 +115,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -126,8 +124,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -137,21 +135,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -175,8 +173,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -189,6 +190,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Napaka" @@ -209,6 +210,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -303,5 +304,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -310,27 +311,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -348,5 +349,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Prekliči" @@ -356,19 +357,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 +msgid "Select target layer" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -msgid "Select target layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -377,5 +378,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "" @@ -488,13 +489,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -592,20 +593,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Datoteka: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -641,10 +642,10 @@ msgstr "Poti se ne da združiti (Vozlišča niso povezana v premem zaporedju)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Združi {0} poti" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "" @@ -688,10 +689,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -710,11 +711,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Prepiši" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Datoteka obstaja. Jo nadomestim?" @@ -761,5 +762,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -768,6 +769,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -783,7 +784,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -811,5 +811,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Podvoji" @@ -833,30 +833,30 @@ msgstr "Zaključek dela z aplikacijo." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Izvoz v GPX ..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Izvoz v datoteko oblike GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -864,13 +864,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -889,8 +889,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -898,7 +898,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -921,9 +921,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -935,5 +935,5 @@ msgstr "parameter ''{0}'' ne sme biti ničen" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -941,5 +941,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "" @@ -1085,6 +1085,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Nova" @@ -1213,5 +1213,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Prilepi" @@ -1299,11 +1299,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Shrani" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Shrani trenutne podatke" @@ -1358,10 +1358,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Shrani kot..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Shrani trenutne podatke v novo datoteko" @@ -1378,30 +1378,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Prikaži poročilo stanja" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" "Prikaži poročilo o stanju s podatki, ki so lahko koristni pri prijavi napak" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Pomoč: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Poročilo stanja" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Kopiraj na odložišče in zapri" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1561,5 +1561,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1567,5 +1567,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1612,55 +1612,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Posodobi izbor" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Posodobi izbor" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Kopiraj izbrane predmete v odložišče" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Izbor je prazen" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Posodobi izbor" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1669,5 +1666,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1675,29 +1672,29 @@ msgstr "Ni sprememb za pošiljanje." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Ni česa poslati. Najprej pridobite kakšne podatke." +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" +msgid "Synchronize way {0} only" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format msgid "Synchronize relation {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1711,11 +1708,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1726,5 +1723,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1734,22 +1731,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +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 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1760,19 +1757,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1781,5 +1778,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1788,15 +1785,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1908,17 +1905,17 @@ msgstr "Počasneje naprej" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Sprejem podatkov GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Sprejem podatkov" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1926,5 +1923,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "" @@ -1978,9 +1975,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Napake pri sprejemu" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -1998,5 +1995,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2004,5 +2001,5 @@ msgstr "Način: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2099,7 +2096,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." -msgstr "Narišite kvadrat poljubne velikosti, nato izpustite miškin gumb." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2108,9 +2104,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Povlecite segment poti za ustvarjenje pravokotnika." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2122,5 +2117,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2140,17 +2135,17 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "Premakni elemente" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Premakni jih" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Razveljavi premik" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2160,13 +2155,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Za izbor predmetov v pravokotniku izpustite miškin gumb." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2175,9 +2170,9 @@ "najbližjo točko." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Za prenehanje vrtenja izpustite miškin gumb." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2185,15 +2180,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Povečava" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Povečava in premik zemljevida" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2201,10 +2196,10 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Išči..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2213,58 +2208,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Prosim, vnesite iskalni izraz." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "regularni izraz" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "nadomesti izbor" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "dodaj v izbor" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "odstrani iz izbora" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "upoštevaj velikost črk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "regularni izraz" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgid "name:Bak - 'Bak' anywhere in the name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 -msgid "name:Bak - 'Bak' anywhere in the name." +msgid "type=route - key 'type' with value exactly 'route'." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2272,34 +2266,34 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 -msgid "-name:Bak - not 'Bak' in the name." +msgid "foot: - key=foot set to any value." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 -msgid "foot: - key=foot set to any value." +msgid "Special targets:" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 -msgid "Special targets:" +msgid "" +"type: - type of the object (node, way, relation)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 -msgid "" -"type: - type of the object (node, way, relation)" +msgid "user:... - all objects changed by user" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -msgid "user:... - all objects changed by user" +msgid "id:... - object with given ID (0 for new objects)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 -msgid "id:... - object with given ID (0 for new objects)" +msgid "nodes:... - object with given number of nodes" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2307,43 +2301,43 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +msgid "modified - all changed objects" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -msgid "modified - all changed objects" +msgid "selected - all selected objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 -msgid "selected - all selected objects" +msgid "incomplete - all incomplete objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 -msgid "incomplete - all incomplete objects" +msgid "untagged - all untagged objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 -msgid "untagged - all untagged objects" +msgid "" +"child expr - all children of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -msgid "" -"parent expr - all parents of objects matching the expression" +msgid "Use | or OR to combine with logical or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 -msgid "Use | or OR to combine with logical or" +msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2353,51 +2347,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Iskanje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Začni iskanje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Z iskanjem ''{0}'' ni bilo v izbor dodano ničesar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Z iskanjem ''{0}'' ni bilo iz izbora odstranjeno ničesar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "Najdeno {0} zadetkov" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +msgid "CS" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +msgid "CI" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 -msgid "CS" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 -msgid "CI" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "" @@ -2411,40 +2405,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2453,9 +2447,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2464,5 +2458,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2560,7 +2554,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2672,5 +2666,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "" @@ -2695,5 +2689,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2701,6 +2695,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "" @@ -2767,17 +2761,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" msgstr "" @@ -2811,10 +2795,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2847,20 +2831,20 @@ msgstr "Zaporedje" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2882,10 +2866,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -2927,5 +2911,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Nova vrednost" @@ -2981,10 +2965,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -2993,5 +2977,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3000,5 +2984,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3007,5 +2991,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3014,5 +2998,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3020,5 +3004,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3027,5 +3011,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3034,5 +3018,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3041,5 +3025,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3048,10 +3032,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3132,25 +3116,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "J" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "S" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "Z" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "V" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3158,5 +3142,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3164,5 +3148,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3172,26 +3156,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3200,5 +3184,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 #, java-format msgid "" @@ -3261,24 +3245,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3286,5 +3270,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3312,10 +3296,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3326,7 +3310,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "parameter ''{0}'' ne sme biti ničen" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3480,10 +3464,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Napaka: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3495,6 +3479,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3506,5 +3490,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3516,6 +3500,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3535,6 +3519,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "ozadje" @@ -3552,19 +3536,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +msgid "Lambert CC Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3578,26 +3578,51 @@ msgstr "Merkator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +msgid "PUWG Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" msgstr "" @@ -3612,10 +3637,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Ne prikaži več" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3623,32 +3648,32 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "nepopoln" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "cesta" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "železnica" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "vodotok" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "raba tal" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3659,5 +3684,5 @@ msgstr[3] "{0} točke" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3697,6 +3722,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Spor" @@ -3706,11 +3731,11 @@ msgstr "Neznan gostitelj" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3906,11 +3931,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4025,5 +4050,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4031,18 +4056,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(ni predmeta)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "plasti ni na seznamu." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4163,67 +4188,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "Lastnosti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Oznake" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Vozlišča" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Člani" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + #: ../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:169 -#, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +msgid "Nodes(resolved)" +msgstr "" + #: ../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: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 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../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:181 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +msgid "Members(resolved)" +msgstr "" + #: ../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:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4231,68 +4256,68 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +msgid "Members(with conflicts)" +msgstr "" + #: ../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:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +msgid "Properties(with conflicts)" +msgstr "" + #: ../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:202 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "Odpravljanje sporov" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4300,5 +4325,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4306,30 +4331,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4337,5 +4362,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4343,14 +4368,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4358,5 +4383,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4364,54 +4389,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "Gor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "Premakni izbrani element za eno mesto višje" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "Dol" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "Premakni izbrani element za eno mesto nižje" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Odstrani" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "Zamrzni" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "Odmrzni" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4420,5 +4445,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4427,5 +4452,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4434,5 +4459,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4441,5 +4466,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4448,6 +4473,6 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4456,6 +4481,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4466,5 +4491,5 @@ msgstr "Vozlišče" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4476,5 +4501,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4483,19 +4508,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4504,9 +4529,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4516,5 +4541,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "" @@ -4538,84 +4563,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "izbrisano" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +msgid "visible (on the server)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +msgid "Keep a clone of the local version" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4625,17 +4650,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4644,9 +4669,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4661,19 +4686,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4689,10 +4714,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4702,10 +4727,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4732,27 +4757,27 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 +msgid ">" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 -msgid ">" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 -msgid "Keep the selected key/value pairs from the local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 +msgid "Undecide" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 -msgid "Undecide" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4777,22 +4802,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4800,5 +4825,5 @@ msgstr "brez" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -4889,6 +4914,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -4899,5 +4924,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -4911,21 +4936,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -4933,5 +4958,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "" @@ -5018,10 +5043,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5041,17 +5066,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Razreši" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5060,25 +5085,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" 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 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 #, java-format msgid "" @@ -5090,13 +5115,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5108,8 +5133,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5176,5 +5201,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5206,34 +5231,34 @@ msgstr "Odpri seznam vseh naloženih plasti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Izbriši izbrano plast." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Prikaži/skrij" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Preklopi vidljivost izbrane plasti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Pomakni izbrano plast vrstico višje." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Pomakni izbrano plast vrstico nižje." @@ -5243,20 +5268,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Spremenili boste do {0} predmetov." -msgstr[1] "Spremenili boste do {0} predmet." -msgstr[2] "Spremenili boste do {0} predmeta." -msgstr[3] "Spremenili boste do {0} predmete." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Prazna vrednost izbriše ključ" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5265,10 +5287,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Sprememba vrednosti?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5279,5 +5301,5 @@ msgstr[3] "Spremeni lastnosti do {0} predmetov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5288,9 +5310,9 @@ msgstr[3] "Spremenili boste do {0} predmete." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Izberite ključ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Izberite vrednost" @@ -5314,102 +5336,98 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Latnosti: {0} / Članstva: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Lastnosti / Članstva" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Spremeni relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Naj res izbrišem izbor iz relacije {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Izbriši izbrani ključ vsem predmetom." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Dodaj nov par ključ/vrednost vsem predmetom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Spremeni vrednost izbranega ključa vsem predmetom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Latnosti: {0} / Članstva: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Lastnosti / Članstva" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Spremeni relacijo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Naj res izbrišem izbor iz relacije {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Izbriši izbrani ključ vsem predmetom." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Relacije" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Odpri seznam vseh relacij." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Odpri urejevalnik za izbrano relacijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Izbriši izbrano relacijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Ustvari novo relacijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5438,5 +5456,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5448,14 +5466,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "" @@ -5536,12 +5554,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "" @@ -5559,5 +5577,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5565,5 +5583,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5571,18 +5589,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 -msgid "Tags and Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5591,14 +5609,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5608,9 +5626,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5620,15 +5638,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5636,5 +5654,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5642,20 +5660,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5664,66 +5682,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Pomakni izbranega člana vrstico višje." #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Pomakni izbranega člana vrstico nižje." #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5732,9 +5750,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5743,41 +5761,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Sprejmi vse nepopolne poti in vozlišča v relaciji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5787,19 +5805,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Sprejem podatkov" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5820,10 +5845,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" msgstr "" @@ -5837,5 +5858,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -5905,9 +5926,9 @@ msgstr "Zaznamki" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -5916,52 +5937,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -5970,52 +5991,52 @@ "Povezava na www.openstreetmap.org (za sprejem področja sem prilepite URL)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Pravokotno področje" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Viri in vrste podatkov" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "Podatki OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Surovi podatki GPS" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Sprejmi kot novo plast" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6023,39 +6044,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Sprejmi področje" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Sprejemanje" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "Področje za sprejem je preveliko; najbrž bo strežnik zahtevo zavrnil" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "" "Področje sprejema v redu, velikost bo verjetno sprejemljiva za strežnik" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6077,21 +6098,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6830,8 +6851,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7004,5 +7025,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7014,5 +7035,5 @@ msgstr "Vrsta" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7059,5 +7080,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7071,5 +7092,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7080,5 +7101,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7087,19 +7108,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7109,32 +7130,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7156,5 +7177,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7216,7 +7237,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "parameter ''{0}'' ne sme biti ničen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 @@ -7246,33 +7267,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 +#, java-format +msgid "Node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 +msgid "Zoom to this node in the current data layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 +msgid "Open a history browser with the history of this node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 +#, java-format +msgid "Way {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 -#, java-format -msgid "Node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Povečava na težavo" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 -msgid "Zoom to this node in the current data layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "Zgodovina" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 -msgid "Open a history browser with the history of this node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 -#, java-format -msgid "Way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 #, java-format msgid "Relation {0}" @@ -7298,7 +7317,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7338,7 +7356,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "Anonimno" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7366,12 +7383,11 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Različica {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "izbrisano" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 @@ -7429,10 +7445,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7643,5 +7659,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7664,17 +7680,17 @@ msgstr "Plast" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7690,7 +7706,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "" @@ -7733,29 +7749,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7763,38 +7779,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Vpišite kratek opis sprememb, ki jih pošiljate:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7802,16 +7818,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7855,24 +7871,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Točka {0} x {1} nima časovne oznake" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Ni mogoče razbrati časa \"{0}\" točke {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -7880,33 +7896,33 @@ msgstr "Berem {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Ni moč najti slik z berljivo časovno oznako." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Slike z geografskim položajem" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "Začetek GPS sledi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "Konec GPS sledi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "trenutna razlika: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "razlika časovnih pasov: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -7917,14 +7933,14 @@ msgstr[3] "slike" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} znotraj sledi." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Uskladi uro" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7932,32 +7948,32 @@ msgstr "Slike JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Datuma v datoteki \"{0}\" ni bilo možno razbrati." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "V datoteki \"{0}\" manjka EXIF čas." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Slika" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Vnesite prikazan čas (mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Uskladite čas z GPS napravo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Vpisanega časa ni bilo mogoče razpoznati." @@ -8047,5 +8063,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8097,10 +8113,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Pretvori v podatkovno plast" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8108,11 +8124,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8122,29 +8138,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Sprejmi iz OSM vzdolž te sledi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Sprejmi vse znotraj:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8155,9 +8171,9 @@ "nadaljevati?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8165,5 +8181,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8171,23 +8187,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "izven sprejetega področja" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8196,5 +8212,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8208,5 +8224,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8219,11 +8235,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8232,22 +8248,34 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} je sestavljen iz:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Pretvori v plast GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +msgid "No problems found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8348,9 +8376,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Prikaži/skrij besedilo/ikone" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "" @@ -8412,5 +8440,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8418,5 +8446,5 @@ msgstr "Prosim izberite vrstico za urejanje." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8424,5 +8452,5 @@ msgstr "Nova vrednost za {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8431,5 +8459,5 @@ msgstr "Prosim izberite vrstico za izbris." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Vpišite nov par ključ/vrednost" @@ -8552,40 +8580,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Barva" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Izberite" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Izberite barvo za {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Barve različnih predmetov v JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Barve" @@ -9018,17 +9046,17 @@ msgstr "Za upoštevanje nekaterih sprememb je potrebno ponovno zagnati JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Oblika prikaza koordinat" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Geografska projekcija" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9038,5 +9066,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9094,81 +9122,81 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9177,6 +9205,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9342,10 +9370,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9355,13 +9383,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9369,18 +9397,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9391,15 +9419,15 @@ msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9411,18 +9439,18 @@ msgstr[3] "Spremeni {0} predmete" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Uporabi prednastavitev" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Spremeni lastnosti" @@ -9438,6 +9466,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9446,8 +9474,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Sprejem točk od {0} do {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9564,11 +9605,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9578,40 +9619,40 @@ msgstr "Sprejemanje podatkov OSM..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9674,5 +9715,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9685,66 +9726,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Pripravljanje..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Pošiljanje ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9779,5 +9820,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9804,5 +9845,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9810,5 +9851,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -9821,5 +9862,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -9970,5 +10011,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -9977,38 +10018,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10016,19 +10057,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "predmet z id=0 ni dovoljen" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10038,10 +10079,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10051,25 +10090,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10534,5 +10573,5 @@ msgstr "(besedilo je že bilo prekopirano na odložišče.)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10541,12 +10580,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10556,5 +10588,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10564,10 +10596,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10576,5 +10603,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10583,5 +10610,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10590,9 +10617,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10602,5 +10636,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10609,5 +10643,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10616,5 +10650,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10623,10 +10657,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10635,10 +10669,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10649,5 +10683,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10657,5 +10691,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11362,5 +11396,5 @@ msgstr "Napaka v datoteki {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11373,28 +11407,45 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, java-format +msgid "Lambert Zone {0} cache file (.{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "" @@ -11424,13 +11475,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11439,13 +11490,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11725,43 +11776,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11769,5 +11825,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "" @@ -11798,5 +11854,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "" @@ -11824,5 +11880,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -11830,28 +11886,28 @@ msgstr "Prazna plast" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Raster size: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -11860,24 +11916,15 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" msgstr "" @@ -12905,20 +12952,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13040,13 +13087,9 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "" @@ -13616,5 +13659,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" +msgid "Unconnected coastline" msgstr "" @@ -14256,12 +14299,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Sprejemanje" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Sprejmi podatke zemljevida s strežnika OSM." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14299,7 +14340,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Podvojena vozlišča" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14365,29 +14405,29 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14396,5 +14436,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14402,10 +14442,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14418,24 +14458,24 @@ msgstr "Samodejno sprejemanje" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14446,57 +14486,62 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Naloži vidne ploščice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Spremeni ločljivost" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "Shrani plast WMS v datoteko" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "Naloži plast WMS iz datoteke" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Nepodprta različica datoteke WMS; našel {0}, pričakoval {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Zaznamki" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -26806,8 +26851,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "" @@ -26827,34 +26871,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: +#: build/trans_wms.java:10 +msgid "Yahoo Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:11 +msgid "OpenStreetMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? +#: build/trans_wms.java:12 +msgid "OpenCycleMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:13 -msgid "Yahoo Sat" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 -msgid "OpenStreetMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 -msgid "OpenCycleMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 msgid "TilesAtHome" msgstr "" @@ -26864,9 +26897,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -26880,22 +26916,70 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "" -#~ msgid "help" -#~ msgstr "pomoč" - -#~ msgid "Help / About" -#~ msgstr "Pomoč / O programu" - -#~ msgid "WMS Plugin Help" -#~ msgstr "Pomoč vstavka WMS" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" #~ msgid "Move" @@ -27014,4 +27098,10 @@ #~ msgstr "povečava" +#~ msgid "help" +#~ msgstr "pomoč" + +#~ msgid "Help / About" +#~ msgstr "Pomoč / O programu" + #~ msgid "Validate" #~ msgstr "Preveri" @@ -27052,4 +27142,7 @@ #~ msgid "Plugin already exists" #~ msgstr "Vstavek že obstaja" + +#~ msgid "WMS Plugin Help" +#~ msgstr "Pomoč vstavka WMS" #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"