Index: applications/editors/josm/i18n/po/sl.po =================================================================== --- applications/editors/josm/i18n/po/sl.po (revision 18975) +++ applications/editors/josm/i18n/po/sl.po (revision 19199) @@ -4,10 +4,11 @@ # FIRST AUTHOR , 2007. # +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-11-29 22:20+0000\n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-06 15:38+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Slovenian \n" @@ -17,38 +18,38 @@ "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-12-06 13:17+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:31+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Priprava grafičnega uporabniškega vmesnika" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Pomoč" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -60,21 +61,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -95,16 +96,7 @@ msgstr "Pozor" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" -msgstr "" - -#: ../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 "" @@ -113,8 +105,17 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -122,10 +123,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -137,9 +138,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -148,6 +150,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -202,8 +204,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -271,5 +273,5 @@ msgstr "O JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -278,5 +280,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -285,5 +287,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -292,15 +294,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -309,29 +316,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -348,5 +356,9 @@ msgstr "Prekliči" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +msgid "Click to abort launching external browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -362,5 +374,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "" @@ -378,15 +390,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." msgstr "Dodaj vozlišče..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Dodaj vozlišče z vpisom zemljepisne širine in dolžine" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -402,22 +414,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Uredi: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Vpišite koordinate novega vozlišča." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Uporabi decimalne stopinje." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negativne vrednosti pomenijo zahodno/južno poloblo." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -426,5 +438,5 @@ msgstr "Z. širina" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -433,28 +445,29 @@ msgstr "Z. dolžina" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -466,9 +479,9 @@ msgstr "V redu" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "" @@ -489,18 +502,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -512,5 +525,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -532,6 +545,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -578,5 +591,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" @@ -613,14 +626,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -630,21 +644,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Datoteka: {0}" +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +msgid "There are no open changesets" +msgstr "" + #: ../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:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." msgstr "" @@ -725,11 +739,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -807,16 +822,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -852,5 +872,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Podvoji" @@ -893,10 +913,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." msgstr "Izvoz v GPX ..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Izvoz v datoteko oblike GPX." @@ -911,12 +931,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -941,8 +961,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -953,10 +973,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -969,17 +989,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1016,22 +1036,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Izberite vsaj eno pot, ki jo želite poenostaviti." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1041,38 +1066,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1080,33 +1101,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Razreši neskladja" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "" @@ -1269,5 +1290,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Predmetov ni možno prestaviti s tega sveta." @@ -1347,28 +1368,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 +msgid "Orthogonalize Shape" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 -msgid "Orthogonalize Shape" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Premakne vozlišča tako, da so koti med njimi 90 ali 270 stopinj" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +msgid "Orthogonalize Shape / Undo" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -msgid "Orthogonalize Shape / Undo" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1377,9 +1398,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1388,15 +1409,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" msgstr "" @@ -1470,18 +1491,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Obrni poti" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Obrni smer izbranih poti." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Izberite vsaj eno pot" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Obrni smer poti" @@ -1490,10 +1511,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Shrani" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Shrani trenutne podatke" @@ -1548,10 +1569,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Shrani kot..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Shrani trenutne podatke v novo datoteko" @@ -1593,6 +1614,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1624,5 +1644,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1689,5 +1709,5 @@ "sredini poti.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1695,5 +1715,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1701,5 +1721,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1733,43 +1753,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Izberite bodisi:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* Eno vozlišče z oznakami" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* Eno vozlišče, ki je del več poti, ali" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* Eno vozlišče, ki je del več poti in eno izmed teh poti, ali" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "* Eno pot, ki ima eno ali več vozlišč, ki so del več poti, ali" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "* Eno pot in eno ali več njenih vozlišč, ki so del več poti." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1779,9 +1799,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1789,5 +1809,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1822,10 +1842,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "" @@ -1833,53 +1853,49 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Posodobi izbor" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Izbor je prazen" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1888,5 +1904,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1894,131 +1910,7 @@ msgstr "Ni sprememb za pošiljanje." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Ni česa poslati. Najprej pridobite kakšne podatke." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

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

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2153,9 +2045,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Sprejem podatkov" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2163,5 +2055,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "" @@ -2232,7 +2124,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2247,58 +2139,52 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Nariši" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Nariši vozlišča" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "izbrano" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Ni mogoče dodati vozlišča izven tega sveta." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Dodaj vozlišče" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Dodaj vozlišče v pot" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Poveži obstoječo pot z vozliščem" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Dodaj novo vozlišče v pot" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Dodaj in poveži vozlišče v pot" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Ustvari novo vozlišče." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Izberi vozlišče pod kazalcem miške." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2309,14 +2195,14 @@ msgstr[3] "Vstavi novo vozlišče v {0} poti." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Začni novo pot od zadnjega vozlišča" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Nadaljuj pot od zadnjega vozlišča." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Zaključi risanje." @@ -2355,18 +2241,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Izberite" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Izberi, premakni ali zasuči predmete" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2375,17 +2262,17 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Premakni elemente" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Premakni jih" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Razveljavi premik" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2395,13 +2282,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Za izbor predmetov v pravokotniku izpustite miškin gumb." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2410,9 +2297,9 @@ "najbližjo točko." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Za prenehanje vrtenja izpustite miškin gumb." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2422,5 +2309,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Povečava" @@ -2442,5 +2329,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Iskanje predmetov." @@ -2536,8 +2423,16 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2545,45 +2440,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2591,55 +2492,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Iskanje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Začni iskanje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "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:276 #, 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:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "Najdeno {0} zadetkov" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2649,40 +2550,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +msgid "Missing parameter for OR" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +msgid "Missing right parent" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +msgid "Missing operator for NOT" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2691,9 +2592,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2702,7 +2603,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "" @@ -2736,17 +2642,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 -msgid "API Capabilities Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 #, java-format msgid "" @@ -2754,5 +2648,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 #, java-format msgid "" @@ -2761,11 +2655,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgid "API Capabilities Violation" msgstr "" @@ -2880,5 +2778,5 @@ msgstr "Nastavi {0}={1} pri {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -2893,5 +2791,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "" @@ -2989,4 +2887,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3098,5 +3011,5 @@ msgstr "Uveljavim?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3178,15 +3091,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3195,5 +3108,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3202,5 +3115,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3209,5 +3122,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3216,5 +3129,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3222,5 +3135,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3229,5 +3142,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3236,5 +3149,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3243,5 +3156,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3250,10 +3163,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3261,24 +3174,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Nastavitve shranjene na {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Nastavitev ni bilo mogoče prenesti. Razlog: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3287,5 +3200,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3314,5 +3227,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3334,31 +3247,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "J" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "S" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "Z" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "V" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3366,5 +3272,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3375,27 +3281,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3403,5 +3309,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3413,5 +3319,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3419,25 +3325,25 @@ #. column header: hide filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 -msgid "H" -msgstr "" - -#. column header: filter text +msgid "Text" +msgstr "" + +#. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 -msgid "Text" -msgstr "" - -#. column header: apply filter for children +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" msgstr "" @@ -3445,43 +3351,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "parameter ''{0}'' ne sme biti ničen" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3489,5 +3407,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3515,10 +3433,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3526,7 +3440,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3541,5 +3455,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3557,146 +3471,138 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Neznana vloga ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "besedilo" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Napaka: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Opozorilo: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "izbrano" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3707,6 +3613,6 @@ msgstr[3] "vozlišča" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3717,7 +3623,8 @@ msgstr[3] "poti" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3728,20 +3635,36 @@ msgstr[3] "relacije" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "nepopolna pot" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "ozadje" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" +msgstr "" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "besedilo" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" msgstr "" @@ -3884,5 +3807,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "železnica" @@ -3898,7 +3821,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -3918,4 +3841,10 @@ msgstr[3] "{0} člani" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -3947,6 +3876,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Spor" @@ -3960,7 +3889,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4039,74 +3968,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Uporabniško ime" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Geslo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "uporaba" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "možnosti" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Prikaži to pomoč" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Sprejmi pravokotno področje" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Odpri datoteko (če .gpx, potem kot surov GPS)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Sprejmi pravokotno področje GPS podatkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Ponastavi nastavitve na privzete" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Nastavi jezik." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4115,9 +4044,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "primeri" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4125,36 +4054,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Aktiviranje posodobljenih vstavkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Nalaganje zgodnjih vstavkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Privzete nastavitve" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Nalaganje vstavkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Datoteka" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4169,22 +4098,22 @@ msgstr "Uredi" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Pogled" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Orodja" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Prednastavitve" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4192,5 +4121,5 @@ msgstr "Meni: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Zvok" @@ -4269,13 +4198,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "plasti ni na seznamu." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4308,5 +4238,5 @@ msgstr "Pripravljanje" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4314,6 +4244,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4322,5 +4252,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4329,5 +4259,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4336,25 +4266,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4362,9 +4292,9 @@ msgstr "Vloga" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4396,11 +4326,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "Lastnosti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4409,6 +4339,6 @@ msgstr "Oznake" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4416,6 +4346,6 @@ msgstr "Vozlišča" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4423,40 +4353,40 @@ msgstr "Člani" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4464,21 +4394,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" @@ -4510,22 +4440,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4533,5 +4463,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4539,30 +4469,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4570,5 +4500,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4576,14 +4506,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4591,5 +4521,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4597,23 +4527,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "Gor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "Premakni izbrani element za eno mesto višje" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "Dol" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "Premakni izbrani element za eno mesto nižje" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4624,27 +4554,27 @@ msgstr "Odstrani" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 msgid "Remove the selected entries from the list of merged elements." msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "Zamrzni" #: ../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: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:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 msgid "Unfreeze" msgstr "Odmrzni" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4653,5 +4583,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4660,5 +4590,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4667,5 +4597,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4674,5 +4604,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4681,5 +4611,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4689,5 +4619,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -4922,10 +4852,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4935,10 +4865,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5023,9 +4953,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5033,6 +4963,6 @@ msgstr "brez" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "" @@ -5121,7 +5051,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5131,6 +5061,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5238,4 +5168,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Izbriši izbrane predmete." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Sprememba vrednosti?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +msgid "Open the list of changesets in the current layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +msgid "Select all objects assigned to the currently selected changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Sprejemanje" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Sprejmi podatke zemljevida s strežnika OSM." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Izbriši izbrane predmete." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Odpri urejevalnik za izbrano relacijo" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5249,12 +5231,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5272,18 +5254,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Razreši" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5291,25 +5273,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5321,26 +5303,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5351,41 +5333,41 @@ msgstr "Dodaj" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "" @@ -5424,5 +5406,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5437,34 +5419,34 @@ msgstr "Odpri seznam vseh naloženih plasti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Izbriši izbrano plast." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Prikaži/skrij" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Preklopi vidljivost izbrane plasti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Pomakni izbrano plast vrstico višje." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Pomakni izbrano plast vrstico nižje." @@ -5474,5 +5456,175 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relacije" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Odpri seznam vseh relacij." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Odpri urejevalnik za izbrano relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Izbriši izbrano relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Ustvari novo relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Trenutni izbor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Odpri okno s seznamom izbora" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Povečava na izbrane predmete" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Povečava na ves izbor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Izbor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Avtorji" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "Odpri seznam ljudi, ki delajo na izbranih predmetih." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Avtor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "Št. predmetov" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "nepopoln" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "Zapri" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Sprejmi seznam" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5481,22 +5633,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Sprememba vrednosti?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5507,5 +5659,5 @@ msgstr[3] "Spremeni lastnosti do {0} predmetov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5516,226 +5668,71 @@ msgstr[3] "Spremenili boste do {0} predmete." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Izberite ključ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Izberite vrednost" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Lastnosti/Članstva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Lastnosti izbranih predmetov" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Latnosti: {0} / Članstva: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Lastnosti / Članstva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Spremeni relacijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Naj res izbrišem izbor iz relacije {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Izbriši izbrani ključ vsem predmetom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Dodaj nov par ključ/vrednost vsem predmetom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Spremeni vrednost izbranega ključa vsem predmetom." - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relacije" - -#: ../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:176 -#, java-format -msgid "Relations: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Odpri urejevalnik za izbrano relacijo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Izbriši izbrano relacijo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Ustvari novo relacijo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Trenutni izbor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Odpri okno s seznamom izbora" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Povečava na izbrane predmete" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Povečava na ves izbor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Izbor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Avtorji" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "Odpri seznam ljudi, ki delajo na izbranih predmetih." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Avtor" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "Št. predmetov" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -5797,16 +5794,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Sprejmi vse nepopolne poti in vozlišča v relaciji" -msgstr[1] "Sprejmi vse nepopolne poti in vozlišča v relaciji" -msgstr[2] "Sprejmi vse nepopolne poti in vozlišča v relaciji" -msgstr[3] "Sprejmi vse nepopolne poti in vozlišča v relaciji" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "Mesto vira sprejema" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 @@ -5829,14 +5823,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Uporabi prednastavitev" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Odpri urejevalnik za izbrano relacijo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -5845,14 +5837,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -5862,9 +5854,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -5874,15 +5866,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5890,5 +5882,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5896,20 +5888,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -5918,70 +5910,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Šport" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 msgid "Move the currently selected members up" msgstr "Pomakni izbranega člana vrstico višje." #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 msgid "Move the currently selected members down" msgstr "Pomakni izbranega člana vrstico nižje." #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5990,9 +5981,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6001,48 +5992,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "Sprejmi vse nepopolne poti in vozlišča v relaciji" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6052,34 +6042,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 +msgid "Zoom to" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 -msgid "Zoom to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6191,10 +6181,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "" @@ -6204,5 +6194,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "" @@ -6287,9 +6277,4 @@ msgid "Download Area" msgstr "Sprejmi področje" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Sprejemanje" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 @@ -6589,6 +6574,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6601,6 +6584,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -6871,4 +6852,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7091,5 +7076,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7132,116 +7117,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Naziv" @@ -7265,15 +7250,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Vrsta" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "" @@ -7444,10 +7429,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7455,5 +7440,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7461,9 +7446,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7578,6 +7563,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "neznan" @@ -7599,13 +7584,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +msgid "Changeset info" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 -msgid "Changeset info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7640,4 +7625,116 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

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

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Vpišite kratek opis sprememb, ki jih pošiljate:" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7656,39 +7753,144 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +msgid "Upload to a new changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +msgid "Upload to an existing changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +msgid "Upload data to an already existing and open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Shrani uporabniško ime in geslo (nekriptirano)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +msgid "Please enter the user name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +msgid "Please enter the password name of your OSM account" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Pozor: Geslo se prenaša nekriptirano" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Samodejno centriraj" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Spremeni relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -7755,17 +7957,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -7778,9 +7980,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -7794,9 +7996,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -7811,50 +8013,50 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Zavrzi in končaj" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7862,5 +8064,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "" @@ -7933,40 +8135,380 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +msgid "Advanced" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Nastavi razpoložljive vstavke." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Neznana vloga ''{0}''." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +msgid "Click to return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "O programu" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +msgid "Click to abort uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +msgid "Changeset is full" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Prosim izberite vrstico za izbris." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Novi predmeti:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Spremenjeni predmeti:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Izbrisani predmeti:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -7975,5 +8517,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -7982,5 +8524,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -7989,210 +8531,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Prosim, vnesite želene koordinate." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Vpišite kratek opis sprememb, ki jih pošiljate:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -msgid "Upload data in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -msgid "(1 request)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Prosim, vpišite iskani niz" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "točka GPS" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Draw lines between points for this layer." msgstr "Riši povezave med točkami na tej plasti." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 msgid "Do not draw lines between points for this layer." msgstr "Ne riši povezav med točkami na tej plasti." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8200,5 +8569,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8207,5 +8576,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8287,5 +8656,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Opis" @@ -8317,10 +8686,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Pretvori v podatkovno plast" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8328,12 +8697,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8342,29 +8711,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "Download from OSM along this track" msgstr "Sprejmi iz OSM vzdolž te sledi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 msgid "Download everything within:" msgstr "Sprejmi vse znotraj:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 #, java-format msgid "{0} sq km" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8375,9 +8744,9 @@ "nadaljevati?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8385,5 +8754,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8391,23 +8760,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "izven sprejetega področja" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8416,5 +8785,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8428,5 +8797,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8439,11 +8808,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8452,36 +8821,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} je sestavljen iz:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Pretvori v plast GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8489,5 +8858,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8496,5 +8865,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8504,5 +8873,5 @@ msgstr[3] "točke" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8513,5 +8882,5 @@ msgstr[3] "sled z {0} točkami" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8520,5 +8889,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8529,24 +8898,24 @@ msgstr[3] "{0} točke" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "Datoteke GPX (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Napaka pri razčlenjevanju {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Ni bilo možno prebrati \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8555,34 +8924,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8590,69 +8959,154 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +msgid "Override position for: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Vse slike" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "izbrano" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 +msgid "Invalid timezone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 +msgid "Invalid offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +msgid "Try Again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 +#, java-format +msgid "Minutes: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 +#, java-format +msgid "Seconds: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, java-format +msgid "
(Time difference of {0} days)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 +msgid "Matching photos to track failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 +msgid "Adjust timezone and offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 msgid "You should select a GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 msgid "No selected GPX track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 #, java-format msgid "" @@ -8661,9 +9115,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 #, java-format msgid "" @@ -8672,134 +9122,56 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Berem {0}..." +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 +#, java-format +msgid "Unable to get canonical path for directory {0}\n" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 +#, java-format +msgid "Scanning directory {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 -#, java-format -msgid "Scanning directory {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 -#, java-format msgid "Error while getting files from directory {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Slike z geografskim položajem" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -8809,52 +9181,96 @@ msgstr[3] "slike" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +msgid "Always delete and don't show this dialog again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Datoteke ni bilo moč najti." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Ni slike" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Napaka v datoteki {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Prikaži slike z geografskim položajem" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +msgid "Show previous Image" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "Pogled: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Odstrani fotografijo iz plasti" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +msgid "Delete File from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +msgid "Show next Image" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -8863,5 +9279,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -8955,4 +9371,12 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "Error displaying URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" msgstr "" @@ -9166,7 +9590,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "" @@ -9235,6 +9658,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Kolo" @@ -9621,31 +10044,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Omogoči posredovalni strežnik" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anonimno" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Bolnišnica" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "šport" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Geslo" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Nastavitve posredovalnega strežnika" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Ime posredovalnega strežnika" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Vrata posredovalnega strežnika" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Uporabniško ime na posredovalnem strežniku" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Geslo na posredovalnem strežniku" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "Osnovni URL naslov strežnika" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "OSM geslo" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -9925,5 +10407,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9933,13 +10415,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -9947,18 +10429,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9969,16 +10451,16 @@ msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -9989,18 +10471,18 @@ msgstr[3] "Spremeni {0} predmete" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Uporabi prednastavitev" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Spremeni lastnosti" @@ -10029,4 +10511,11 @@ msgstr "Sprejem točk od {0} do {1}..." +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 @@ -10042,12 +10531,67 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Pripravljam podatke..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10150,16 +10694,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10169,40 +10713,40 @@ msgstr "Sprejemanje podatkov OSM..." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10210,12 +10754,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Sprejem točk od {0} do {1}..." -msgstr[1] "Sprejem točk od {0} do {1}..." -msgstr[2] "Sprejem točk od {0} do {1}..." -msgstr[3] "Sprejem točk od {0} do {1}..." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10252,14 +10794,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 #, java-format msgid "" @@ -10268,16 +10810,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10285,66 +10827,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Pripravljanje..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Pošiljanje ..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Pripravljam podatke..." + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Spremeni {0} predmetov" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10370,4 +10923,14 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 msgid "Invalid bz2 file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." msgstr "" @@ -10379,5 +10942,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10404,5 +10967,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10410,5 +10973,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10421,5 +10984,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10430,57 +10993,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Napačno uporabniško ime ali geslo." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Pozor: Geslo se prenaša nekriptirano" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Shrani uporabniško ime in geslo (nekriptirano)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Vnesite geslo" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "Osnovni URL naslov strežnika" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "OSM geslo" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10570,5 +11082,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10577,38 +11096,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -10616,19 +11135,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "predmet z id=0 ni dovoljen" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -10638,8 +11157,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -10649,25 +11168,41 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -10675,5 +11210,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -10682,5 +11217,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -10688,5 +11223,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -10695,13 +11230,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." msgstr "Priprava podatkov OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -10724,21 +11259,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Sprejemanje podatkov OSM..." +msgstr[1] "Sprejemanje podatkov OSM..." +msgstr[2] "Sprejemanje podatkov OSM..." +msgstr[3] "Sprejemanje podatkov OSM..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "Sprejem točk od {0} do {1}..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10766,9 +11315,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -10829,5 +11374,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 #, java-format msgid "({0}/{1}) Uploading {2} objects..." @@ -10836,4 +11381,8 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +msgid "Unexpected id 0 for osm primitive found" msgstr "" @@ -10876,12 +11425,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Izbriši {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Napaka pri brisanju datoteke vstavka: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11023,9 +11572,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "opis ni na voljo" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" @@ -11159,4 +11708,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11439,6 +12003,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Pošiljanje sledi" @@ -11524,5 +12088,5 @@ msgstr "Pošiljanje sledi GPX" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "Pošlji sledi na openstreetmap.org" @@ -11533,5 +12097,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Interpolacija naslovov" @@ -11546,11 +12110,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "" @@ -11571,12 +12132,10 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "slik" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Izposojevalnica" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -11706,5 +12265,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "" @@ -11766,21 +12325,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11789,13 +12348,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -11820,17 +12379,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -11842,18 +12401,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -11861,5 +12420,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -11867,52 +12426,49 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" msgstr "" @@ -12114,5 +12670,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "" @@ -12303,5 +12859,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Ni naloženih podatkov." @@ -12323,9 +12879,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "" @@ -12711,7 +13267,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "" @@ -12861,19 +13417,19 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "" @@ -12912,33 +13468,33 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "Zajemi GPS sled" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "" "Povezava s strežnikom gpsd in prikaz trenutnega položaja na plasti LiveGPS." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Centriraj zdaj" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Centiraj plast LiveGPS na trenuten položaj." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Samodejno centriraj" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Nenehno centriraj plast LiveGPS na trenutni položaj." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "" @@ -12989,9 +13545,9 @@ msgstr "" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "merilni način" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "" @@ -13029,5 +13585,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13038,13 +13594,13 @@ msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 msgid "One of the selected ways is already part of another multipolygon." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "" -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "" @@ -13185,5 +13741,5 @@ msgstr "" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13275,5 +13831,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13349,41 +13905,41 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Naloži ploščico" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Naloži vse ploščice" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "" @@ -13552,4 +14108,41 @@ msgstr "" +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +msgid "Even/Odd" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Ceste" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +msgid " is not a number" +msgstr "" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -13568,41 +14161,19 @@ msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Ime ceste" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" msgstr "" @@ -13618,5 +14189,5 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Mreža" @@ -14263,38 +14834,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "zgradba" @@ -14308,5 +14849,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "" @@ -14421,10 +14962,10 @@ msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15122,6 +15663,6 @@ #: build/trans_presets.java:132 build/trans_presets.java:152 #: build/trans_presets.java:189 build/trans_presets.java:209 -#: build/trans_presets.java:1571 build/trans_presets.java:2400 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:1560 build/trans_presets.java:2389 +#: build/trans_presets.java:3191 msgid "Reference" msgstr "" @@ -15567,5 +16108,5 @@ #: build/trans_presets.java:731 build/trans_presets.java:744 #: build/trans_presets.java:757 build/trans_presets.java:1322 -#: build/trans_presets.java:1512 build/trans_presets.java:1554 +#: build/trans_presets.java:1498 build/trans_presets.java:1543 msgid "Width (meters)" msgstr "" @@ -15683,5 +16224,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "metal" msgstr "" @@ -15693,5 +16234,5 @@ #: build/trans_presets.java:483 build/trans_presets.java:502 #: build/trans_presets.java:521 build/trans_presets.java:677 -#: build/trans_presets.java:1320 build/trans_presets.java:2475 +#: build/trans_presets.java:1320 build/trans_presets.java:2464 msgid "wood" msgstr "" @@ -15949,4 +16490,7 @@ #. item "Car/Parking" combo "Spaces for Women" #. item "Car/Parking" combo "Spaces for Parents" +#. item "Public Transport/Bus Stop" combo "Shelter" +#. item "Public Transport/Bus Stop" combo "Bench" +#. item "Public Transport/Bus Stop" combo "Tactile Paving" #. item "Tourism/Information Terminal" combo "Fee" #. item "Tourism/Audioguide" combo "Fee" @@ -15978,8 +16522,10 @@ #: build/trans_presets.java:1408 build/trans_presets.java:1411 #: build/trans_presets.java:1412 build/trans_presets.java:1413 -#: build/trans_presets.java:1778 build/trans_presets.java:1788 -#: build/trans_presets.java:2438 build/trans_presets.java:2474 -#: build/trans_presets.java:2483 build/trans_presets.java:2484 -#: build/trans_presets.java:2485 build/trans_presets.java:2755 +#: build/trans_presets.java:1532 build/trans_presets.java:1533 +#: build/trans_presets.java:1534 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 +#: build/trans_presets.java:2463 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 +#: build/trans_presets.java:2758 msgid "yes" msgstr "da" @@ -16127,9 +16673,10 @@ #: build/trans_presets.java:1407 build/trans_presets.java:1408 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 -#: build/trans_presets.java:2474 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 -#: build/trans_presets.java:2755 +#: build/trans_presets.java:1413 build/trans_presets.java:1532 +#: build/trans_presets.java:1533 build/trans_presets.java:1534 +#: build/trans_presets.java:1767 build/trans_presets.java:1777 +#: build/trans_presets.java:2427 build/trans_presets.java:2463 +#: build/trans_presets.java:2472 build/trans_presets.java:2473 +#: build/trans_presets.java:2474 build/trans_presets.java:2758 msgid "no" msgstr "" @@ -16374,5 +16921,5 @@ #. #. -#: build/trans_presets.java:361 build/trans_style.java:3159 +#: build/trans_presets.java:361 build/trans_style.java:3175 msgid "residential" msgstr "" @@ -16407,5 +16954,5 @@ #. #: build/trans_presets.java:361 build/trans_style.java:667 -#: build/trans_style.java:4260 +#: build/trans_style.java:4239 msgid "service" msgstr "" @@ -16439,6 +16986,6 @@ #. #. color construction -#: build/trans_presets.java:361 build/trans_style.java:877 -#: build/trans_style.java:3224 build/trans_style.java:3225 +#: build/trans_presets.java:361 build/trans_style.java:848 +#: build/trans_style.java:3240 build/trans_style.java:3241 msgid "construction" msgstr "" @@ -16488,5 +17035,5 @@ #. #. -#: build/trans_presets.java:423 build/trans_style.java:895 +#: build/trans_presets.java:423 build/trans_style.java:866 msgid "roundabout" msgstr "krožišče" @@ -16674,6 +17221,6 @@ #. item "Tourism/Map" label "Routes shown for:" #. item "Tourism/Guidepost" label "Routes shown for:" -#: build/trans_presets.java:682 build/trans_presets.java:1740 -#: build/trans_presets.java:1763 +#: build/trans_presets.java:682 build/trans_presets.java:1729 +#: build/trans_presets.java:1752 msgid "Hiking" msgstr "" @@ -16794,5 +17341,4 @@ #. item "Car/Fuel" text "Name" #. item "Car/Wash" text "Name" -#. item "Car/Shop" text "Name" #. item "Car/Repair" text "Name" #. item "Car/Rental" text "Name" @@ -16818,4 +17364,5 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Shops/Car Dealer" text "Name" #. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" @@ -16825,15 +17372,15 @@ #: build/trans_presets.java:777 build/trans_presets.java:914 #: build/trans_presets.java:1396 build/trans_presets.java:1420 -#: build/trans_presets.java:1427 build/trans_presets.java:1433 -#: build/trans_presets.java:1441 build/trans_presets.java:1448 -#: build/trans_presets.java:1776 build/trans_presets.java:1786 -#: build/trans_presets.java:2215 build/trans_presets.java:2317 -#: build/trans_presets.java:2347 build/trans_presets.java:2399 -#: build/trans_presets.java:2407 build/trans_presets.java:2424 -#: build/trans_presets.java:2436 build/trans_presets.java:2444 -#: build/trans_presets.java:2451 build/trans_presets.java:2505 -#: build/trans_presets.java:2553 build/trans_presets.java:2719 -#: build/trans_presets.java:2734 build/trans_presets.java:2773 -#: build/trans_presets.java:3193 +#: build/trans_presets.java:1426 build/trans_presets.java:1434 +#: build/trans_presets.java:1441 build/trans_presets.java:1765 +#: build/trans_presets.java:1775 build/trans_presets.java:2204 +#: build/trans_presets.java:2306 build/trans_presets.java:2336 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2413 build/trans_presets.java:2425 +#: build/trans_presets.java:2433 build/trans_presets.java:2440 +#: build/trans_presets.java:2494 build/trans_presets.java:2504 +#: build/trans_presets.java:2556 build/trans_presets.java:2722 +#: build/trans_presets.java:2737 build/trans_presets.java:2776 +#: build/trans_presets.java:3196 msgid "Operator" msgstr "" @@ -17045,7 +17592,7 @@ #. item "Geography/Places/Glacier" text "Name" #. item "Geography/Places/Volcano" text "Name" -#: build/trans_presets.java:854 build/trans_presets.java:1615 -#: build/trans_presets.java:1760 build/trans_presets.java:2887 -#: build/trans_presets.java:2894 build/trans_presets.java:2901 +#: build/trans_presets.java:854 build/trans_presets.java:1604 +#: build/trans_presets.java:1749 build/trans_presets.java:2890 +#: build/trans_presets.java:2897 build/trans_presets.java:2904 msgid "Elevation" msgstr "" @@ -17464,5 +18011,5 @@ msgstr "" -#. color deprecated +#. color woodarea #. 1 #. 50000 @@ -17472,5 +18019,5 @@ #. #. -#: build/trans_presets.java:1148 build/trans_style.java:3400 +#: build/trans_presets.java:1148 build/trans_style.java:3407 msgid "marsh" msgstr "" @@ -17996,32 +18543,32 @@ #. item "Health/Pharmacy" text "Name" #. item "Health/Veterinary" text "Name" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1686 build/trans_presets.java:1693 -#: build/trans_presets.java:1701 build/trans_presets.java:1714 -#: build/trans_presets.java:1728 build/trans_presets.java:1825 -#: build/trans_presets.java:1833 build/trans_presets.java:1936 -#: build/trans_presets.java:1942 build/trans_presets.java:2255 -#: build/trans_presets.java:2279 build/trans_presets.java:2506 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1675 build/trans_presets.java:1682 +#: build/trans_presets.java:1690 build/trans_presets.java:1703 +#: build/trans_presets.java:1717 build/trans_presets.java:1814 +#: build/trans_presets.java:1822 build/trans_presets.java:1925 +#: build/trans_presets.java:1931 build/trans_presets.java:2244 +#: build/trans_presets.java:2268 build/trans_presets.java:2495 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Opening Hours" msgstr "" @@ -18080,91 +18627,91 @@ #. item "Health/Pharmacy" combo "Opening Hours" #. item "Health/Veterinary" combo "Opening Hours" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "24/7" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Mo-Fr 08:30-20:00" msgstr "" -#: build/trans_presets.java:1397 build/trans_presets.java:1636 -#: build/trans_presets.java:1644 build/trans_presets.java:1651 -#: build/trans_presets.java:1658 build/trans_presets.java:1664 -#: build/trans_presets.java:1671 build/trans_presets.java:1678 -#: build/trans_presets.java:1693 build/trans_presets.java:1701 -#: build/trans_presets.java:1714 build/trans_presets.java:1728 -#: build/trans_presets.java:1825 build/trans_presets.java:1833 -#: build/trans_presets.java:1936 build/trans_presets.java:1942 -#: build/trans_presets.java:2255 build/trans_presets.java:2279 -#: build/trans_presets.java:2514 build/trans_presets.java:2520 -#: build/trans_presets.java:2527 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2568 build/trans_presets.java:2575 -#: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2601 -#: build/trans_presets.java:2607 build/trans_presets.java:2613 -#: build/trans_presets.java:2619 build/trans_presets.java:2625 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2658 build/trans_presets.java:2664 -#: build/trans_presets.java:2670 build/trans_presets.java:2676 -#: build/trans_presets.java:2683 build/trans_presets.java:2690 -#: build/trans_presets.java:2697 build/trans_presets.java:2703 -#: build/trans_presets.java:2709 build/trans_presets.java:2720 -#: build/trans_presets.java:2728 build/trans_presets.java:2743 -#: build/trans_presets.java:2749 build/trans_presets.java:2757 -#: build/trans_presets.java:2784 +#: build/trans_presets.java:1397 build/trans_presets.java:1625 +#: build/trans_presets.java:1633 build/trans_presets.java:1640 +#: build/trans_presets.java:1647 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1667 +#: build/trans_presets.java:1682 build/trans_presets.java:1690 +#: build/trans_presets.java:1703 build/trans_presets.java:1717 +#: build/trans_presets.java:1814 build/trans_presets.java:1822 +#: build/trans_presets.java:1925 build/trans_presets.java:1931 +#: build/trans_presets.java:2244 build/trans_presets.java:2268 +#: build/trans_presets.java:2517 build/trans_presets.java:2523 +#: build/trans_presets.java:2530 build/trans_presets.java:2537 +#: build/trans_presets.java:2543 build/trans_presets.java:2549 +#: build/trans_presets.java:2571 build/trans_presets.java:2578 +#: build/trans_presets.java:2585 build/trans_presets.java:2591 +#: build/trans_presets.java:2598 build/trans_presets.java:2604 +#: build/trans_presets.java:2610 build/trans_presets.java:2616 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 +#: build/trans_presets.java:2635 build/trans_presets.java:2642 +#: build/trans_presets.java:2649 build/trans_presets.java:2655 +#: build/trans_presets.java:2661 build/trans_presets.java:2667 +#: build/trans_presets.java:2673 build/trans_presets.java:2679 +#: build/trans_presets.java:2686 build/trans_presets.java:2693 +#: build/trans_presets.java:2700 build/trans_presets.java:2706 +#: build/trans_presets.java:2712 build/trans_presets.java:2723 +#: build/trans_presets.java:2731 build/trans_presets.java:2746 +#: build/trans_presets.java:2752 build/trans_presets.java:2760 +#: build/trans_presets.java:2787 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -18179,5 +18726,5 @@ #. --> #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18196,7 +18743,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "" @@ -18212,5 +18759,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "" @@ -18223,6 +18770,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "" @@ -18261,22 +18808,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "" @@ -18284,5 +18819,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Izposojevalnica" @@ -18291,10 +18826,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Uredi izposojevalnico avtomobilov" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "" @@ -18302,5 +18837,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "" @@ -18308,10 +18843,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "" @@ -18320,22 +18855,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Uredi izposojevalnico koles" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Javni prevoz" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18345,5 +18873,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18351,5 +18879,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "" @@ -18357,5 +18885,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Železniško postajališče" @@ -18363,5 +18891,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "" @@ -18369,5 +18897,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "" @@ -18376,5 +18904,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "" @@ -18382,5 +18910,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Železniški peron" @@ -18389,5 +18917,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Uredi železniški peron" @@ -18399,5 +18927,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "" @@ -18405,10 +18933,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Vhod v podzemno" @@ -18417,10 +18945,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Uredi vhod v podzemno" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "" @@ -18429,5 +18957,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Avtobusna postaja" @@ -18436,5 +18964,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Uredi avtobusno postajo" @@ -18442,5 +18970,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Avtobusno postajališče" @@ -18450,5 +18978,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Uredu avtobusno postajališče" @@ -18457,17 +18985,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Klopca" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Avtobusni peron" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Uredi avtobusni peron" @@ -18475,5 +19011,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Taksi" @@ -18481,5 +19017,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Uredi postajališče taksijev" @@ -18487,5 +19023,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Letališče" @@ -18493,15 +19029,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "" @@ -18509,10 +19045,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Nastanitev" @@ -18524,5 +19060,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "" @@ -18531,15 +19067,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "" @@ -18547,20 +19083,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "" @@ -18568,10 +19104,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "" @@ -18579,30 +19115,30 @@ #. item "Travel/Accomodation/Hostel" #. +#: build/trans_presets.java:1596 +msgid "Edit Hostel" +msgstr "" + +#. item "Travel/Accomodation/Hostel" text "Name" +#: build/trans_presets.java:1600 +msgid "Alpine Hut" +msgstr "" + +#. item "Travel/Accomodation/Alpine Hut" +#: build/trans_presets.java:1601 +msgid "Edit Alpine Hut" +msgstr "" + +#. item "Travel/Accomodation/Alpine Hut" text "Elevation" +#: build/trans_presets.java:1606 +msgid "Caravan Site" +msgstr "" + +#. item "Travel/Accomodation/Caravan Site" #: build/trans_presets.java:1607 -msgid "Edit Hostel" -msgstr "" - -#. item "Travel/Accomodation/Hostel" text "Name" +msgid "Edit Caravan Site" +msgstr "" + +#. item "Travel/Accomodation/Caravan Site" text "Name" #: build/trans_presets.java:1611 -msgid "Alpine Hut" -msgstr "" - -#. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 -msgid "Edit Alpine Hut" -msgstr "" - -#. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 -msgid "Caravan Site" -msgstr "" - -#. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 -msgid "Edit Caravan Site" -msgstr "" - -#. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 msgid "Camping Site" msgstr "" @@ -18610,10 +19146,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Hrana in pijača" @@ -18624,5 +19160,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "" @@ -18630,5 +19166,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "" @@ -18636,5 +19172,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "" @@ -18642,61 +19178,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "" @@ -18704,9 +19240,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "" @@ -18714,9 +19250,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Pivnica" @@ -18724,18 +19260,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Uredi pivnico" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "" @@ -18743,9 +19279,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "" @@ -18753,24 +19289,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Turizem" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Muzej" @@ -18778,9 +19314,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Uredi muzej" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Živalski vrt" @@ -18789,9 +19325,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Uredi živalski vrt" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Razgledišče" @@ -18799,24 +19335,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Uredi razgledišče" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Umetnina" @@ -18824,5 +19360,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Uredi umetnino" @@ -18830,19 +19366,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Zemljevid" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -18880,5 +19416,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -18886,28 +19422,28 @@ msgstr "" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "" @@ -18917,5 +19453,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "" @@ -18923,6 +19459,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Kolesarjenje" @@ -18930,5 +19466,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "" @@ -18936,6 +19472,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Smučanje" @@ -18943,5 +19479,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "" @@ -18949,46 +19485,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" msgstr "" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "" @@ -18996,29 +19532,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "" +#: build/trans_presets.java:1769 +msgid "Audioguide" +msgstr "" + +#. +#: build/trans_presets.java:1779 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 -msgid "Audioguide" -msgstr "" - -#. +msgid "Phone number" +msgstr "" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1782 +msgid "Other Information Points" +msgstr "" + +#. item "Tourism/Shelter" #: build/trans_presets.java:1790 -msgid "Audioguide via mobile phone?" -msgstr "" - -#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 -msgid "Phone number" -msgstr "" - -#. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 -msgid "Other Information Points" -msgstr "" - -#. item "Tourism/Shelter" -#: build/trans_presets.java:1801 msgid "Edit Shelter" msgstr "" @@ -19026,25 +19562,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Zgodovinski kraji" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Grad" @@ -19053,19 +19589,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Uredi grad" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Ruševine" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Uredi ruševine" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Arheološko najdišče" @@ -19074,9 +19610,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Uredi arheološko najdišče" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "" @@ -19084,10 +19620,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "" @@ -19095,5 +19631,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "" @@ -19101,15 +19637,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "" @@ -19117,55 +19653,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "" #. item "Historic Places/Memorial" text "Name" +#: build/trans_presets.java:1848 +msgid "Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" +#: build/trans_presets.java:1849 +msgid "Edit Wayside Cross" +msgstr "" + +#. item "Historic Places/Wayside Cross" text "Name" +#: build/trans_presets.java:1853 +msgid "Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" +#: build/trans_presets.java:1854 +msgid "Edit Wayside Shrine" +msgstr "" + +#. item "Historic Places/Wayside Shrine" text "Name" +#: build/trans_presets.java:1858 +msgid "Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" #: build/trans_presets.java:1859 -msgid "Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 -msgid "Edit Wayside Cross" -msgstr "" - -#. item "Historic Places/Wayside Cross" text "Name" +msgid "Edit Boundary Stone" +msgstr "" + +#. item "Historic Places/Boundary Stone" text "Name" #: build/trans_presets.java:1864 -msgid "Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 -msgid "Edit Wayside Shrine" -msgstr "" - -#. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 -msgid "Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 -msgid "Edit Boundary Stone" -msgstr "" - -#. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 msgid "Leisure" msgstr "Prosti čas" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Vodni park" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Uredi vodni park" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Igrišče" @@ -19173,35 +19709,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Uredi igrišče" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Ribarjenje" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Uredi ribarjenje" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Stadion" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Uredi stadion" @@ -19215,6 +19751,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "izberite šport:" @@ -19606,30 +20142,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "šport" @@ -19639,225 +20175,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "lokostrelstvo" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "košarka" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "plezanje" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "kolesarjenje" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "gimnastika" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "hokej" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "strelišče" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "smučanje" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "nogomet" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "plavanje" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "namizni_tenis" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tenis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Športno središče" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Uredi športno središče" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Golf igrišče" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Uredi golf igrišče" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Mini golf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Uredi mini golf" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Šport" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "" @@ -19896,21 +20432,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "vrsta" @@ -19949,203 +20485,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "stadion" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "" #. item "Sport/10pin" +#: build/trans_presets.java:1942 +msgid "Edit 10pin" +msgstr "" + +#: build/trans_presets.java:1947 +msgid "Athletics" +msgstr "" + +#. item "Sport/Athletics" +#: build/trans_presets.java:1948 +msgid "Edit Athletics" +msgstr "" + #: build/trans_presets.java:1953 -msgid "Edit 10pin" -msgstr "" - -#: build/trans_presets.java:1958 -msgid "Athletics" -msgstr "" - -#. item "Sport/Athletics" -#: build/trans_presets.java:1959 -msgid "Edit Athletics" -msgstr "" - -#: build/trans_presets.java:1964 msgid "Archery" msgstr "Lokostrelstvo" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Uredi lokostrelstvo" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Plezanje" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Uredi plezanje" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Uredi kolesarjenje" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Pasje dirke" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Uredi pasje dirke" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "Konjske dirke" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "Uredi konjske dirke" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "Gimnastika" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "Uredi gimnastiko" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "" #. item "Sport/Motor Sports" +#: build/trans_presets.java:2002 +msgid "Edit Motor Sports" +msgstr "" + +#: build/trans_presets.java:2007 +msgid "Skating" +msgstr "" + +#. item "Sport/Skating" +#: build/trans_presets.java:2008 +msgid "Edit Skating" +msgstr "" + #: build/trans_presets.java:2013 -msgid "Edit Motor Sports" -msgstr "" - -#: build/trans_presets.java:2018 -msgid "Skating" -msgstr "" - -#. item "Sport/Skating" +msgid "Skateboard" +msgstr "" + +#. item "Sport/Skateboard" +#: build/trans_presets.java:2014 +msgid "Edit Skateboard" +msgstr "" + #: build/trans_presets.java:2019 -msgid "Edit Skating" -msgstr "" - -#: build/trans_presets.java:2024 -msgid "Skateboard" -msgstr "" - -#. item "Sport/Skateboard" -#: build/trans_presets.java:2025 -msgid "Edit Skateboard" -msgstr "" - -#: build/trans_presets.java:2030 msgid "Swimming" msgstr "Plavanje" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Uredi plavanje" @@ -20153,56 +20689,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "Uredi smučanje" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Strelišče" @@ -20210,182 +20746,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Uredi strelišče" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Šport (z žogo)" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Nogomet" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Uredi nogomet" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "" #. item "Sport (Ball)/Football" +#: build/trans_presets.java:2050 +msgid "Edit Football" +msgstr "" + +#: build/trans_presets.java:2055 +msgid "Australian Football" +msgstr "" + +#. item "Sport (Ball)/Australian Football" +#: build/trans_presets.java:2056 +msgid "Edit Australian Football" +msgstr "" + #: build/trans_presets.java:2061 -msgid "Edit Football" -msgstr "" - -#: build/trans_presets.java:2066 -msgid "Australian Football" -msgstr "" - -#. item "Sport (Ball)/Australian Football" +msgid "Baseball" +msgstr "" + +#. item "Sport (Ball)/Baseball" +#: build/trans_presets.java:2062 +msgid "Edit Baseball" +msgstr "" + #: build/trans_presets.java:2067 -msgid "Edit Australian Football" -msgstr "" - -#: build/trans_presets.java:2072 -msgid "Baseball" -msgstr "" - -#. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 -msgid "Edit Baseball" -msgstr "" - -#: build/trans_presets.java:2078 msgid "Basketball" msgstr "Košarka" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Uredi košarko" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Uredi golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "golf_igrišče" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "" #. item "Sport (Ball)/Boule" +#: build/trans_presets.java:2080 +msgid "Edit Boule" +msgstr "" + +#: build/trans_presets.java:2085 +msgid "Bowls" +msgstr "" + +#. item "Sport (Ball)/Bowls" +#: build/trans_presets.java:2086 +msgid "Edit Bowls" +msgstr "" + #: build/trans_presets.java:2091 -msgid "Edit Boule" -msgstr "" - -#: build/trans_presets.java:2096 -msgid "Bowls" -msgstr "" - -#. item "Sport (Ball)/Bowls" +msgid "Cricket" +msgstr "" + +#. item "Sport (Ball)/Cricket" +#: build/trans_presets.java:2092 +msgid "Edit Cricket" +msgstr "" + #: build/trans_presets.java:2097 -msgid "Edit Bowls" -msgstr "" - -#: build/trans_presets.java:2102 -msgid "Cricket" -msgstr "" - -#. item "Sport (Ball)/Cricket" +msgid "Cricket Nets" +msgstr "" + +#. item "Sport (Ball)/Cricket Nets" +#: build/trans_presets.java:2098 +msgid "Edit Cricket Nets" +msgstr "" + #: build/trans_presets.java:2103 -msgid "Edit Cricket" -msgstr "" - -#: build/trans_presets.java:2108 -msgid "Cricket Nets" -msgstr "" - -#. item "Sport (Ball)/Cricket Nets" +msgid "Croquet" +msgstr "" + +#. item "Sport (Ball)/Croquet" +#: build/trans_presets.java:2104 +msgid "Edit Croquet" +msgstr "" + #: build/trans_presets.java:2109 -msgid "Edit Cricket Nets" -msgstr "" - -#: build/trans_presets.java:2114 -msgid "Croquet" -msgstr "" - -#. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 -msgid "Edit Croquet" -msgstr "" - -#: build/trans_presets.java:2120 msgid "Hockey" msgstr "Hokej" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Uredi hokej" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "" #. item "Sport (Ball)/Pelota" +#: build/trans_presets.java:2116 +msgid "Edit Pelota" +msgstr "" + +#: build/trans_presets.java:2121 +msgid "Racquet" +msgstr "" + +#. item "Sport (Ball)/Racquet" +#: build/trans_presets.java:2122 +msgid "Edit Racquet" +msgstr "" + #: build/trans_presets.java:2127 -msgid "Edit Pelota" -msgstr "" - -#: build/trans_presets.java:2132 -msgid "Racquet" -msgstr "" - -#. item "Sport (Ball)/Racquet" +msgid "Rugby" +msgstr "" + +#. item "Sport (Ball)/Rugby" +#: build/trans_presets.java:2128 +msgid "Edit Rugby" +msgstr "" + #: build/trans_presets.java:2133 -msgid "Edit Racquet" -msgstr "" - -#: build/trans_presets.java:2138 -msgid "Rugby" -msgstr "" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 -msgid "Edit Rugby" -msgstr "" - -#: build/trans_presets.java:2144 msgid "Table Tennis" msgstr "Namizni tenis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Uredi namizni tenis" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tenis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Uredi tenis" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Zgradbe" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Zgradba" @@ -20393,5 +20929,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Javne zgradbe" @@ -20399,10 +20935,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Uredi javno zgradbo" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Mestna hiša" @@ -20410,10 +20946,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Uredi mestno hišo" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Veleposlaništvo" @@ -20421,10 +20957,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Uredi veleposlaništvo" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Sodišče" @@ -20433,10 +20969,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Uredi sodišče" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Zapor" @@ -20445,10 +20981,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Uredi zapor" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Policijska postaja" @@ -20458,10 +20994,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Uredi policijsko postajo" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Gasilski dom" @@ -20470,10 +21006,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Uredi gasilski dom" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Pošta" @@ -20481,5 +21017,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Uredi pošto" @@ -20487,15 +21023,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "Šola" @@ -20503,10 +21039,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Uredi šolo" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "" @@ -20514,10 +21050,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "" @@ -20525,5 +21061,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "" @@ -20531,5 +21067,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Kinematograf" @@ -20538,10 +21074,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Uredi kinematograf" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Knjižnica" @@ -20550,9 +21086,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Uredi knjižnico" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "" @@ -20560,10 +21096,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Gledališče" @@ -20572,10 +21108,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Uredi gledališče" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Kraj čaščenja" @@ -20585,5 +21121,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Uredi kraj čaščenja" @@ -20592,6 +21128,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Vera" @@ -20600,66 +21136,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "" @@ -20668,81 +21204,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Naslovi" @@ -20751,5 +21287,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Urejanje podatkov o naslovu" @@ -20757,5 +21293,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "" @@ -20763,20 +21299,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Ime ceste" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Poštna številka" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "" @@ -20785,5 +21326,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Uredi interpolacijo naslovov" @@ -20791,61 +21332,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Stolp" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Uredi stolp" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "" @@ -20853,25 +21394,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Vodni stolp" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Uredi vodni stolp" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Svetilnik" @@ -20879,10 +21420,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Uredi svetilnik" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Mlin na veter" @@ -20890,10 +21431,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Uredi mlin na veter" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Cevovod" @@ -20902,37 +21443,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Uredi cevovod" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Čistilna naprava" @@ -20942,10 +21483,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Uredi čistilno napravo" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Žerjav" @@ -20953,10 +21494,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Uredi žerjav" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "" @@ -20964,10 +21505,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Geodetska točka" @@ -20975,10 +21516,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Uredi geodetsko točko" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Video nadzor" @@ -20986,5 +21527,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Uredi video nadzorno kamero" @@ -20992,5 +21533,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "" @@ -21000,35 +21541,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "" @@ -21037,10 +21578,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "" @@ -21049,5 +21590,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "" @@ -21055,10 +21596,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Steber daljnovoda" @@ -21069,23 +21610,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Uredi steber daljnovoda" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "" @@ -21094,75 +21635,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Stranišča" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Poštni nabiralnik" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Telefon" @@ -21171,5 +21712,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Uredi telefon" @@ -21177,5 +21718,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Kovanci" @@ -21183,5 +21724,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Bankovci" @@ -21189,5 +21730,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "" @@ -21195,5 +21736,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Debetne kartice" @@ -21201,15 +21742,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Kreditne kartice" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Telefonske kartice" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Recikliranje" @@ -21218,5 +21759,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Uredi raciklažno točko" @@ -21224,68 +21765,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Klopca" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "" @@ -21356,39 +21892,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "" @@ -21397,30 +21933,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "" @@ -21429,10 +21965,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Pitna voda" @@ -21441,10 +21977,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Uredi pitno vodo" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "" @@ -21452,33 +21988,56 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Trgovine" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +msgid "Bike Dealer" +msgstr "" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "" @@ -21486,9 +22045,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "" @@ -21496,27 +22055,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Prodajni avtomat" @@ -21524,5 +22083,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Uredi prodajni avtomat" @@ -21530,88 +22089,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Prodajani izdelki" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "pijača" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM kartice" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Mesar" @@ -21619,9 +22178,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Uredi mesarja" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Pekarna" @@ -21629,9 +22188,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Uredi pekarno" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "" @@ -21639,18 +22198,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "" @@ -21658,54 +22217,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "" @@ -21713,9 +22272,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "" @@ -21723,9 +22282,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Sam svoj mojster" @@ -21733,54 +22292,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Uredi sam svoj mojster trgovino" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Čistilnica" @@ -21788,9 +22347,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Uredi čistilnico" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Pralnica" @@ -21798,9 +22357,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Uredi pralnico" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "" @@ -21808,28 +22367,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Denar" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Banka" @@ -21837,14 +22396,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Uredi banko" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Menjalnica" @@ -21852,5 +22411,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Uredi menjalnico" @@ -21858,15 +22417,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Uredi bankomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Zdravje" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "" @@ -21874,18 +22433,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Lekarna" @@ -21893,5 +22452,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Uredi lekarno" @@ -21899,9 +22458,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Bolnišnica" @@ -21909,10 +22468,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Uredi bolnišnico" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "" @@ -21921,5 +22480,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "" @@ -21928,20 +22487,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "" @@ -21949,5 +22508,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "" @@ -21956,64 +22515,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Kraji" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Uredi kontinent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Država" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Uredi državo" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "" @@ -22021,15 +22580,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "" @@ -22037,10 +22596,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "" @@ -22048,25 +22607,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Vas" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Uredi vas" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Zaselek" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Uredi zaselek" @@ -22074,5 +22633,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "" @@ -22080,10 +22639,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "Otok" @@ -22091,10 +22650,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Uredi otok" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "" @@ -22102,5 +22661,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "" @@ -22108,5 +22667,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "" @@ -22114,10 +22673,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Vrh" @@ -22125,10 +22684,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Uredi vrh" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "" @@ -22136,10 +22695,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "" @@ -22147,70 +22706,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Meje" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Raba tal" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Drevo" @@ -22219,15 +22778,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Uredi drevo" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "" @@ -22236,5 +22795,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "" @@ -22242,17 +22801,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Gozd" @@ -22261,14 +22820,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Uredi gozdnata tla" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Naravni rezervat" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Uredi naravni rezervat" @@ -22276,25 +22835,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "" @@ -22302,10 +22861,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "" @@ -22313,5 +22872,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "" @@ -22319,5 +22878,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "" @@ -22326,45 +22885,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Vinograd" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Uredi vinograd" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "" @@ -22372,25 +22931,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "" @@ -22398,10 +22957,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "" @@ -22409,20 +22968,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "" @@ -22430,5 +22989,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -22436,15 +22995,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Pokopališče" @@ -22452,9 +23011,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Uredi pokopališče" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "" @@ -22462,39 +23021,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Ozemlje železnice" @@ -22502,15 +23061,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Uredi ozemlje železnice" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "" @@ -22518,55 +23077,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Gradbišče" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Kamnolom" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Uredi kamnolom" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "" @@ -22576,5 +23135,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "" @@ -22583,10 +23142,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "" @@ -22594,5 +23153,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "" @@ -22601,5 +23160,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "" @@ -22607,34 +23166,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "" @@ -22643,15 +23202,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "" @@ -22659,5 +23218,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "" @@ -22666,5 +23225,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "" @@ -22672,5 +23231,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "" @@ -22742,24 +23301,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "" @@ -22812,5 +23371,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22819,13 +23378,13 @@ msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "" @@ -22839,10 +23398,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "" @@ -22850,31 +23409,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "" @@ -22883,30 +23442,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "" @@ -23117,130 +23676,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23257,98 +23690,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "" @@ -23725,7 +24067,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "" @@ -23789,13 +24131,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -23811,5 +24232,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "" @@ -23823,5 +24244,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "" @@ -23842,5 +24263,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "" @@ -23855,5 +24276,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "" @@ -23868,5 +24289,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "" @@ -23880,5 +24301,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "" @@ -23892,5 +24313,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "" @@ -23912,16 +24333,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24018,4 +24427,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24084,13 +24500,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "" @@ -24136,6 +24552,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24152,7 +24568,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "" @@ -24175,10 +24591,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "" @@ -24214,11 +24630,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "" #. color rail +#. #. 1 #. 50000 @@ -24259,6 +24676,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "" @@ -24272,5 +24689,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "" @@ -24292,5 +24709,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "" @@ -24304,5 +24721,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "" @@ -24310,4 +24727,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24357,7 +24781,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "" @@ -24374,5 +24798,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "" @@ -24387,5 +24811,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "" @@ -24400,5 +24824,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "" @@ -24413,5 +24837,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "" @@ -24426,5 +24850,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "" @@ -24439,5 +24863,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "" @@ -24557,11 +24981,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "" @@ -24575,5 +24999,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "" @@ -24587,5 +25011,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "" @@ -24713,12 +25137,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "" @@ -24732,5 +25173,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "" @@ -24768,4 +25209,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24784,4 +25241,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24802,8 +25267,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "" @@ -24905,10 +25372,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "" @@ -25162,5 +25629,5 @@ #. #. -#. +#. #. color health #. @@ -25306,4 +25773,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25323,23 +25798,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "" @@ -25371,6 +25846,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "" @@ -25431,14 +25906,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -25785,5 +26260,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -25806,5 +26280,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "" @@ -25876,8 +26351,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "" @@ -25978,9 +26453,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "" @@ -26068,9 +26543,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "" @@ -26084,5 +26559,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "" @@ -26096,5 +26571,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "" @@ -26116,5 +26591,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "" @@ -26128,5 +26603,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "" @@ -26140,5 +26615,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "" @@ -26161,5 +26636,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "" @@ -26173,5 +26648,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "" @@ -26185,5 +26660,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "" @@ -26197,5 +26672,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "" @@ -26209,5 +26684,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "" @@ -26264,7 +26739,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "" @@ -26278,5 +26753,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "" @@ -26289,5 +26764,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "" @@ -26302,5 +26777,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "" @@ -26314,5 +26789,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "" @@ -26367,8 +26842,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "" @@ -26382,5 +26857,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "" @@ -26394,5 +26869,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "" @@ -26406,5 +26881,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "" @@ -26418,5 +26893,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "" @@ -26430,5 +26905,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "" @@ -26506,8 +26981,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "" @@ -26555,7 +27030,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "" @@ -26705,11 +27180,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "" @@ -26757,6 +27232,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "" @@ -27112,27 +27587,57 @@ msgstr "" +#~ msgid "All images" +#~ msgstr "Vse slike" + +#~ msgid "Enable proxy server" +#~ msgstr "Omogoči posredovalni strežnik" + +#~ msgid "Anonymous" +#~ msgstr "Anonimno" + +#~ msgid "Proxy server host" +#~ msgstr "Ime posredovalnega strežnika" + +#~ msgid "Proxy server port" +#~ msgstr "Vrata posredovalnega strežnika" + +#~ msgid "Proxy server username" +#~ msgstr "Uporabniško ime na posredovalnem strežniku" + +#~ msgid "Proxy server password" +#~ msgstr "Geslo na posredovalnem strežniku" + +#~ msgid "Preparing..." +#~ msgstr "Pripravljanje..." + +#~ msgid "Uploading..." +#~ msgstr "Pošiljanje ..." + +#~ msgid "Incorrect password or username." +#~ msgstr "Napačno uporabniško ime ali geslo." + +#~ msgid "Enter Password" +#~ msgstr "Vnesite geslo" + +#~ msgid "Move" +#~ msgstr "Premakni" + +#~ msgid "Data Layer" +#~ msgstr "Podatkovna plast" + +#~ msgid "No data imported." +#~ msgstr "Nič podatkov ni bilo uvoženih." + +#~ msgid "Select a bookmark first." +#~ msgstr "Najprej izberite zaznamek." + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Ni mogoče razbrati časa \"{0}\" točke {1} x {2}" + #~ msgid "No time for point {0} x {1}" #~ msgstr "Točka {0} x {1} nima časovne oznake" -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Ni mogoče razbrati časa \"{0}\" točke {1} x {2}" - -#~ msgid "No images with readable timestamps found." -#~ msgstr "Ni moč najti slik z berljivo časovno oznako." - -#~ msgid "GPS start: {0}" -#~ msgstr "Začetek GPS sledi: {0}" - -#~ msgid "GPS end: {0}" -#~ msgstr "Konec GPS sledi: {0}" - -#~ msgid "current delta: {0}s" -#~ msgstr "trenutna razlika: {0}s" - -#~ msgid "timezone difference: " -#~ msgstr "razlika časovnih pasov: " - -#~ msgid "{0} within the track." -#~ msgstr "{0} znotraj sledi." +#~ msgid "Image" +#~ msgstr "Slika" #~ msgid "Sync clock" @@ -27144,34 +27649,4 @@ #~ msgid "There is no EXIF time within the file \"{0}\"." #~ msgstr "V datoteki \"{0}\" manjka EXIF čas." - -#~ msgid "Image" -#~ msgstr "Slika" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Vnesite prikazan čas (mm/dd/yyyy HH:MM:SS)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Uskladite čas z GPS napravo" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "Vpisanega časa ni bilo mogoče razpoznati." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - slike z geografskim položajem" - -#~ msgid "Move" -#~ msgstr "Premakni" - -#~ msgid "Data Layer" -#~ msgstr "Podatkovna plast" - -#~ msgid "No data imported." -#~ msgstr "Nič podatkov ni bilo uvoženih." - -#~ msgid "Select a bookmark first." -#~ msgstr "Najprej izberite zaznamek." - -#~ msgid "File could not be found." -#~ msgstr "Datoteke ni bilo moč najti." #~ msgid "Cannot open preferences directory: {0}" @@ -27224,4 +27699,28 @@ #~ msgstr "Spori pri zlivanju" +#~ msgid "No images with readable timestamps found." +#~ msgstr "Ni moč najti slik z berljivo časovno oznako." + +#~ msgid "GPS start: {0}" +#~ msgstr "Začetek GPS sledi: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "trenutna razlika: {0}s" + +#~ msgid "GPS end: {0}" +#~ msgstr "Konec GPS sledi: {0}" + +#~ msgid "timezone difference: " +#~ msgstr "razlika časovnih pasov: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} znotraj sledi." + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Vpisanega časa ni bilo mogoče razpoznati." + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Vnesite prikazan čas (mm/dd/yyyy HH:MM:SS)" + #~ msgid "unnamed" #~ msgstr "neimenovano" @@ -27274,4 +27773,7 @@ #~ msgid "Validate" #~ msgstr "Preveri" + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - slike z geografskim položajem" #~ msgid "Unknown version" @@ -27287,4 +27789,7 @@ #~ "Vstavek {0} izgleda pokvarjen, ali pa ga ni bilo mogoče samodejno " #~ "sprejeti." + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Uskladite čas z GPS napravo" #~ msgid "Upload to OSM..."